Subversion Repositories ALCASAR

Compare Revisions

Ignore whitespace Rev 636 → Rev 637

/alcasar.sh
299,7 → 299,8
PRIVATE_IP_MASK=$DEFAULT_PRIVATE_IP_MASK
fi
else
PRIVATE_IP_MASK=`grep PRIVATE_IP |cut -d"=" -f2` /tmp/conf/etc/alcasar.conf
PRIVATE_IP_MASK=`grep PRIVATE_IP conf/etc/alcasar.conf|cut -d"=" -f2`
rm -rf conf/etc/alcasar.conf
fi
# Définition de la config réseau côté "LAN de consultation"
hostname $HOSTNAME
1510,8 → 1511,8
else echo "#### Installation with update ####";
fi
# Extract the central configuration file
tar -xvf /tmp/alcasar-conf.tar.gz conf/etc/alcasar.conf -C /tmp
ORGANISME=`cat /tmp/conf/etc/alcasar.conf|grep ORGANISM|cut -d"=" -f2`
tar -xf /tmp/alcasar-conf.tar.gz conf/etc/alcasar.conf
ORGANISME=`grep ORGANISM conf/etc/alcasar.conf|cut -d"=" -f2`
mode="update"
else
mode="install"
1519,7 → 1520,7
for func in init network gestion AC init_db param_radius param_web_radius param_chilli param_squid param_dansguardian antivirus param_ulogd param_awstats param_dnsmasq BL cron post_install
do
$func
echo "*** 'debug' : end of function $func ***"; read a
# echo "*** 'debug' : end of function $func ***"; read a
done
;;
-u | --uninstall)