Subversion Repositories ALCASAR

Compare Revisions

Ignore whitespace Rev 933 → Rev 932

/scripts/alcasar-conf.sh
44,7 → 44,7
PRIVATE_NETWORK_SHORT=`echo $PRIVATE_NETWORK | cut -d"." -f1-$classe`. # @ compatible hosts.allow et hosts.deny (ex.: 192.168.182.)
}
 
usage="Usage: alcasar-conf.sh {--create or -create} | {--load or -load} | {--apply or -apply}"
usage="Usage: alcasar-conf.sh {--create ou -create} | {--load or -load} | {--apply or -apply}"
nb_args=$#
args=$1
if [ $nb_args -eq 0 ]
212,7 → 212,6
if [ $YOUTUBE_ID = "-1" ]; then
echo "YOUTUBE_ID=ABCD1234567890abcdef" >> $CONF_FILE
fi
cp /etc/sysconfig/dnsmasq $DIR_UPDATE
# copie du fichier de conf modifié
cp $CONF_FILE $DIR_UPDATE/etc/
# le répertoire "ISO" est remplacé par "system_backup" suite à la suppression de "mondoarchive" (V2.5)
256,7 → 255,6
PARENT_SCRIPT=$0
export PARENT_SCRIPT
$DIR_SBIN/alcasar-bl.sh -reload
[ -e $DIR_UPDATE/dnsmasq ] && cp -f $DIR_UPDATE/dnsmasq /etc/sysconfig/dnsmasq
# Prise en compte des comptes de gestion (admin + manager + backup)
$DIR_SBIN/alcasar-profil.sh --list
# Start / Stop SSH Daemon
318,10 → 316,6
ORGANISME=`grep ORGANISM $CONF_FILE|cut -d"=" -f2`
DOMAIN=`grep DOMAIN $CONF_FILE|cut -d"=" -f2`
DHCP_mode=`grep DHCP= $CONF_FILE|cut -d"=" -f2`
if [ $DHCP_mode = "off" ]
then
$DIR_SBIN/alcasar-dhcp.sh --off
fi
# Logout everybody
$DIR_SBIN/alcasar-logout.sh all
# Services stop
/scripts/sbin/alcasar-rpm-download.sh
File deleted
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
Deleted: svn:executable
-*
\ No newline at end of property
/alcasar.sh
1261,11 → 1261,9
$SED "/killproc \$DAEMON_NAME/a killproc \$DAEMON_NAME" /etc/init.d/dnsmasq
# Start after chilli (65) which create tun0
$SED "s?^# chkconfig:.*?# chkconfig: 2345 99 40?g" /etc/init.d/dnsmasq
# Optionnellement on pré-active les logs DNS des clients
# Optionnellement on active les logs DNS des clients
[ -e /etc/sysconfig/dnsmasq.default ] || cp /etc/sysconfig/dnsmasq /etc/sysconfig/dnsmasq.default
$SED "s?log-facility?#OPTIONS=\"-q --log-facility=/var/log/dnsmasq/queries.log\"?g" /etc/sysconfig/dnsmasq
# Optionnellement, exemple de configuration avec un A.D.
echo '#OPTIONS="$OPTIONS --server=/your-domain/192.168.182.2"' >> /etc/sysconfig/dnsmasq
$SED "s?^OPTIONS=.*?#OPTIONS=\"-q --log-facility=/var/log/dnsmasq/queries.log\"?g" /etc/sysconfig/dnsmasq
} # End dnsmasq
 
##########################################################