Subversion Repositories ALCASAR

Compare Revisions

Ignore whitespace Rev 637 → Rev 638

/scripts/alcasar-conf.sh
82,13 → 82,17
rm -f $DIR_UPDATE/etc/alcasar-dns-name # changement de format
rm -f $DIR_UPDATE/etc/alcasar-macallowed # ajout d'un commentaire par @MAC
rm -rf $DIR_UPDATE/etc/digest # hostname=alcasar
uamallowed=`cat $DIR_UPDATE/etc/alcasar-uamallowed`
if [ $uamallowed == "uamallowed=\"\"" ]
then rm -f $DIR_UPDATE/etc/alcasar-uamallowed # un uamallowed 'vide' perturbe coova
if [ -e $DIR_UPDATE/etc/alcasar-uamallowed ]; then
uamallowed=`cat $DIR_UPDATE/etc/alcasar-uamallowed`
if [ $uamallowed == "uamallowed=\"\"" ]
then rm -f $DIR_UPDATE/etc/alcasar-uamallowed # un uamallowed 'vide' perturbe coova
fi
fi
uamdomain=`cat $DIR_UPDATE/etc/alcasar-uamdomain`
if [ $uamdomain == "uamdomain=\"\"" ]
then rm -f $DIR_UPDATE/etc/alcasar-uamdomain # un uamdomain 'vide' perturbe coova
if [ -e $DIR_UPDATE/etc/alcasar-uamdomain ]; then
uamdomain=`cat $DIR_UPDATE/etc/alcasar-uamdomain`
if [ $uamdomain == "uamdomain=\"\"" ]
then rm -f $DIR_UPDATE/etc/alcasar-uamdomain # un uamdomain 'vide' perturbe coova
fi
fi
else
# si version >= 2.1 : sauvegarde des certificats (serveur et CA)
147,14 → 151,14
fi
PROTOCOLS_FILTERING=`grep ^FILTERING /usr/local/bin/alcasar-iptables.sh | cut -d"=" -f2`
PROTOCOLS_FILTERING=${PROTOCOLS_FILTERING:="no"}
if [ $PROTOCOLS_FILTERING="no" ]; then
if [ $PROTOCOLS_FILTERING = "no" ]; then
echo "PROTOCOLS_FILTERING=off" >> $CONF_FILE
else
echo "PROTOCOLS_FILTERING=on" >> $CONF_FILE
fi
WEB_FILTERING=`grep ^reportinglevel /etc/dansguardian/dansguardian.conf | cut -d"=" -f2 | tr -d " "`
DNS_FILTERING=`grep ^reportinglevel /etc/dansguardian/dansguardian.conf | cut -d"=" -f2 | tr -d " "`
DNS_FILTERING=${DNS_FILTERING:="-1"}
if [ $DNS_FILTERING="-1" ]; then
if [ $DNS_FILTERING -eq "-1" ]; then
echo "DNS_FILTERING=off" >> $CONF_FILE
else
echo "DNS_FILTERING=on" >> $CONF_FILE
/scripts/alcasar-urpmi.sh
120,7 → 120,7
# update with cached RPM
urpmi --auto $PACKAGES
# On supprime les paquetages inutiles
for rm_rpm in shorewall dhcp-server c-icap-server cyrus-sasl distcache-server avahi mandi radeontool
for rm_rpm in shorewall dhcp-server c-icap-server cyrus-sasl distcache-server avahi mandi radeontool coova-chilli python-coova-chilli
do
/usr/sbin/urpme --auto $rm_rpm --auto-orphans 2>/dev/null
echo -n "."
128,7 → 128,7
# On installe les RPMs spécifiques à la version
urpmi --no-verify --auto conf/rpms/$ARCH/*.rpm
# On empêche les mises à jour de coova-chilli et freeradius par le biais des dépôts
for rpmskip in coova freeradius
for rpmskip in coova-chilli freeradius
do
echo -n "/^$rpmskip/" >> /etc/urpmi/skip.list
done