Subversion Repositories ALCASAR

Compare Revisions

Ignore whitespace Rev 308 → Rev 309

/scripts/sbin/alcasar-bl.sh
6,11 → 6,11
 
DIR_tmp="/tmp/blacklists"
FILE_tmp="/tmp/fileFilter.txt"
BL_CATEGORIES=/usr/local/etc/alcasar-bl-categories
BL_CATEGORIES="/usr/local/etc/alcasar-bl-categories"
DIR_DANSGUARDIAN="/etc/dansguardian/lists/"
DIR_DNS_FILTER_AVAILABLE="/usr/local/etc/alcasar-dnsfilter-available"
DIR_DNS_FILTER_ENABLE="/usr/local/etc/alcasar-dnsfilter-enabled"
IP_RETOUR="127.0.0.1"
DIR_DNS_FILTER_ENABLED="/usr/local/etc/alcasar-dnsfilter-enabled"
IP_RETOUR="192.168.182.1"
BL_SERVER="cri.univ-tlse1.fr"
SED="/bin/sed -i"
# Récupération de l'archive de la BL Toulouse
58,10 → 58,10
 
# Permet d'activer/désactiver les catégories de la BL
function cat_choice (){
rm -rf $DIR_DNS_FILTER_ENABLE
rm -rf $DIR_DNS_FILTER_ENABLED/*
for i in `cat $BL_CATEGORIES`
do
echo $i
ln -s $DIR_DNS_FILTER_AVAILABLE/$i.conf $DIR_DNS_FILTER_ENABLED/$i
done
}
usage="Usage: alcasar-bl.sh -on | -off | -download| -reload"
79,16 → 79,20
;;
# activation du filtrage
-on)
# pour dansguardian
$SED "s/^reportinglevel =.*/reportinglevel = 3/g" /etc/dansguardian/dansguardian.conf
service dansguardian reload
# pour dnsmasq
cat_choice
service dansguardian reload
service dnsmasq restart
;;
# désactivation du filtrage
-off)
# pour dansguardian
$SED "s/^reportinglevel =.*/reportinglevel = -1/g" /etc/dansguardian/dansguardian.conf
rm -rf $DIR_DNS_FILTER_ENABLE
service dansguardian reload
# pour dnsmasq
rm -rf $DIR_DNS_FILTER_ENABLED/*
service dnsmasq restart
;;
# Mise a jour de la blacklist 'Toulouse' et adaptation à dansguardian et dnsmasq
/scripts/alcasar-watchdog.sh
38,8 → 38,7
net_pb=`cat /etc/dnsmasq.d/alcasar-dnsmasq.conf|grep "address=/#/"|wc -l`
if [ $net_pb != "1" ]
then
rm -f /var/www/html/redirect/index.php
ln -s /var/www/html/redirect/index-network-pb.php /var/www/html/redirect/index.php
ln -sf /var/www/html/redirect/index-network-pb.php /var/www/html/redirect/index.php
/bin/sed -i "s?^conf-dir=.*?address=\/#\/$PRIVATE_IP?g" /etc/dnsmasq.d/alcasar-dnsmasq.conf
/etc/init.d/dnsmasq restart
fi
73,6 → 72,7
net_pb=`cat /etc/dnsmasq.d/alcasar-dnsmasq.conf|grep "address=/#/"|wc -l`
if [ $net_pb -eq "1" ]
then
ln -sf /var/www/html/redirect/index-access-deny.php /var/www/html/redirect/index.php
/bin/sed -i "s?^address=\/#\/.*?conf-dir=/usr/local/etc/alcasar-dnsfilter-enabled?g" /etc/dnsmasq.d/alcasar-dnsmasq.conf
/etc/init.d/dnsmasq restart
fi