Subversion Repositories ALCASAR

Compare Revisions

Regard whitespace Rev 923 → Rev 922

/scripts/alcasar-conf.sh
32,8 → 32,6
MAJ_RUNNING_VERSION=`echo $RUNNING_VERSION|cut -d"." -f1`
MIN_RUNNING_VERSION=`echo $RUNNING_VERSION|cut -d"." -f2|cut -c1`
UPD_RUNNING_VERSION=`echo $RUNNING_VERSION|cut -d"." -f3`
DOMAIN=`grep DOMAIN $CONF_FILE|cut -d"=" -f2`
DOMAIN=${DOMAIN:=localdomain}
DATE=`date '+%d %B %Y - %Hh%M'`
private_network_calc ()
{
126,7 → 124,6
INSTALL_DATE=$DATE
VERSION=$RUNNING_VERSION
ORGANISM=$ORGANISM
DOMAIN=$DOMAIN
EOF
PUBLIC_IP=`grep IPADDR /etc/sysconfig/network-scripts/ifcfg-$EXTIF|cut -d"=" -f2` # @ip du portail (côté Internet)
PUBLIC_NETMASK=`grep NETMASK /etc/sysconfig/network-scripts/ifcfg-$EXTIF|cut -d"=" -f2`
145,9 → 142,6
echo "DNS2=$DNS2" >> $CONF_FILE
echo "PRIVATE_IP=$PRIVATE_IP/$PRIVATE_PREFIX" >> $CONF_FILE
echo "DHCP=half" >> $CONF_FILE
echo "EXT_DHCP_IP=none" >> $CONF_FILE
echo "RELAY_DHCP_IP=none" >> $CONF_FILE
echo "RELAY_DHCP_PORT=none" >> $CONF_FILE
if [ -r /var/run/sshd.pid ]; then
echo "SSH=on" >> $CONF_FILE
314,12 → 308,11
VERSION=`grep VERSION $CONF_FILE|cut -d"=" -f2`
INSTALL_DATE=`grep INSTALL_DATE $CONF_FILE|cut -d"=" -f2`
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`
# Logout everybody
$DIR_SBIN/alcasar-logout.sh all
# Services stop
for i in squid ntpd chilli httpd network
for i in squid ntpd chilli httpd sshd network
do
[ -e /etc/init.d/$i ] && /etc/init.d/$i stop && killall $i 2>/dev/null
done
327,7 → 320,7
# /etc/hosts
cat <<EOF > /etc/hosts
127.0.0.1 localhost
$PRIVATE_IP $HOSTNAME $HOSTNAME.$DOMAIN
$PRIVATE_IP $HOSTNAME
EOF
 
# Ext Network Card config
395,8 → 388,6
/etc/init.d/sshd start
else
/sbin/chkconfig --del sshd
echo "Au redémarrage du serveur, le service SSH sera désactivé !!! ; au besoin l'activer dans l'interface de gestion."
sleep 2
fi
# Reload BL (restart DG, dnsmasq & iptables)
$DIR_SBIN/alcasar-bl.sh -reload