Subversion Repositories ALCASAR

Compare Revisions

Ignore whitespace Rev 498 → Rev 499

/alcasar.sh
1059,12 → 1059,10
# Inclusion de la blacklist <domains> de Toulouse dans la configuration
conf-dir=/usr/local/etc/alcasar-dnsfilter-enabled
conf-file=/usr/local/etc/alcasar-dns-name # zone de definition de noms DNS locaux
 
listen-address=$PRIVATE_IP
listen-address=127.0.0.1
no-dhcp-interface=$INTIF
bind-interfaces
 
cache-size=256
domain=$DOMAIN
domain-needed
1073,7 → 1071,6
filterwin2k
server=$DNS1
server=$DNS2
 
# le servive DHCP est configuré mais n'est exploité que pour le "bypass"
dhcp-range=$ORGANISME,$PRIVATE_DYN_FIRST_IP,$PRIVATE_DYN_LAST_IP,$PRIVATE_MASK,12h
#dhcp-option=3,1.2.3.4
1088,13 → 1085,10
cat << EOF > /etc/dnsmasq-forward.conf
# Dnsmasq configuration for exception filter users (no blackhole)
conf-file=/usr/local/etc/alcasar-dns-name # zone de definition de noms DNS locaux
 
listen-address=$PRIVATE_IP
listen-address=127.0.0.1
port=54
no-dhcp-interface=$INTIF
bind-interfaces
 
cache-size=256
domain=$DOMAIN
domain-needed
1109,8 → 1103,8
# On modifie le fichier d'initialisattion (lancement dune deuxième instance)
[ -e /etc/init.d/dnsmasq ] && cp /etc/init.d/dnsmasq /etc/init.d/dnsmasq.default
$SED "s?^DOMAIN_SUFFIX=.*?DOMAIN_SUFFIX=''?g" /etc/init.d/dnsmasq
$SED "/daemon \$dnsmasq/a daemon \$dnsmasq -C /etc/dnsmasq-forward.conf" /etc/init.d/dnsmasq
$SED "/killproc \$iDAEMON_NAME/a killall \$DAEMON_NAME" /etc/init.d/dnsmasq
$SED "/\$dnsmasq/a daemon \$dnsmasq -C /etc/dnsmasq-forward.conf" /etc/init.d/dnsmasq
$SED "/killproc \$DAEMON_NAME/a killall \$DAEMON_NAME" /etc/init.d/dnsmasq
} # End dnsmasq
 
##########################################################
/scripts/sbin/alcasar-bl.sh
98,7 → 98,9
if [ "$PARENT_SCRIPT" != "/usr/local/bin/alcasar-conf.sh" ] # on ne relance pas les processus lors d'une install
then
service dansguardian restart
service dnsmasq restart
service dnsmasq stop
sleep 1
service dnsmasq start
fi
;;
# désactivation du filtrage
109,7 → 111,9
if [ "$PARENT_SCRIPT" != "/usr/local/bin/alcasar-conf.sh" ] # on ne relance pas les processus lors d'une install
then
service dansguardian restart
service dnsmasq restart
service dnsmasq stop
sleep 1
service dnsmasq start
fi
;;
# Mise a jour de la blacklist 'Toulouse' et adaptation à dansguardian et dnsmasq
148,8 → 152,10
fi
cp -f $DIR_DG_BL/ossi/domains $DIR_DNS_FILTER_AVAILABLE/ossi.conf
$SED "s?.*?address=/&/$IP_RETOUR?g" $DIR_DNS_FILTER_AVAILABLE/ossi.conf
service dnsmasq restart
;;
service dnsmasq stop
sleep 1
service dnsmasq start
;
*)
echo "Argument inconnu :$1";
echo "$usage"