| /alcasar.sh |
|---|
| 1043,7 → 1043,7 |
| [ -d /etc/dnsmasq.d ] || mkdir /etc/dnsmasq.d |
| [ -d /var/log/dnsmasq ] || mkdir /var/log/dnsmasq |
| [ -e /etc/dnsmasq.conf ] || cp /etc/dnsmasq.conf /etc/dnsmasq.conf.default |
| $SED "s?^[^#]?#&?g" /etc/dnsmasq.conf # (on commente ce qui ne l'est pas) |
| $SED "s?^[^#]?#&?g" /etc/dnsmasq.conf # (on commente ce qui ne l'est pas) |
| cp -f $DIR_CONF/alcasar-dnsmasq.conf /etc/dnsmasq.d/. |
| ln -s $DIR_DEST_ETC/alcasar-dnsmasq-filter /etc/dnsmasq.d/ |
| $SED "s?^#conf-dir=.*?conf-dir=/etc/dnsmasq.d?g" /etc/dnsmasq.conf # les fichiers de config se trouvent dans /etc/dnsmasq.d/* |
| 1051,6 → 1051,7 |
| $SED "s?^domain=.*?domain=$DOMAIN?g" /etc/dnsmasq.d/alcasar-dnsmasq.conf |
| $SED "s?^#dhcp-range=.*?dhcp-range=$ORGANISME,$PRIVATE_DYN_FIRST_IP,$PRIVATE_DYN_LAST_IP,$PRIVATE_NETMASK,12h?g" /etc/dnsmasq.d/alcasar-dnsmasq.conf |
| $SED "s?^#listen-address=.*?listen-address=$PRIVATE_IP?g" /etc/dnsmasq.d/alcasar-dnsmasq.conf |
| $SED "s?^DHCP_LEASE=.*?DHCP_LEASE=/var/log/dnsmasq/lease.log?g" /etc/sysconfig/dnsmasq |
| chown root:apache /usr/local/etc/alcasar-dnsmasq-filter # modifiable par apache et interface de gestion |
| chmod -R g+rw /usr/local/etc/alcasar-dnsmasq-filter |
| } |
| /conf/alcasar-dnsmasq.conf |
|---|
| 11,8 → 11,7 |
| #dhcp-option=option:ntp-server,192.168.0.4,10.10.0.5 |
| filterwin2k |
| #except-interface=eth0 |
| # Or which to listen on by address (remember to include 127.0.0.1 if |
| # you use this.) |
| # Or which to listen on by address (remember to include 127.0.0.1 if you use this.) |
| #listen-address=192.168.10.1 |
| #interface=eth1 |
| domain=localdomain.fr |
| /scripts/alcasar-conf.sh |
|---|
| 47,12 → 47,9 |
| # Sauvegarde des listes de filtrage |
| echo "sauvegarde de l'ancienne blacklist ..." |
| cp -rf /etc/dansguardian/lists/ $DIR_UPDATE |
| # sauvegarde des fichiers de filtrage réseau |
| # sauvegarde des fichiers de filtrage réseau + dnsmasq |
| mkdir $DIR_UPDATE/etc/ |
| cp -rf $DIR_DEST_ETC/* $DIR_UPDATE/etc/ |
| # sauvegarde des fichiers de dnsmasq |
| mkdir $DIR_UPDATE/etc/dnsmasq.d |
| cp -rf /etc/dnsmasq.d/* $DIR_UPDATE/etc/dnsmasq.d/ |
| # création de l'archive |
| cd /tmp |
| 90,8 → 87,6 |
| # Récupération des comptes de gestion (admin + manager + backup) |
| cp -rf $DIR_UPDATE/digest $DIR_WEB/ |
| $DIR_DEST_SBIN/alcasar-profil.sh -list |
| # Récupération des config de dnsmasq (préparation) |
| ln -s $DIR_DEST_ETC/dnsmasq.d /etc/. |
| # Récupération des règles de filtrage réseau |
| cp -rf $DIR_UPDATE/etc/* $DIR_DEST_ETC/ |
| chown root:apache $DIR_DEST_ETC/* |
| /scripts/etc/alcasar-dnsmasq-filter |
|---|
| 1,3 → 1,4 |
| address=/doubleclick.net/127.0.0.1 |
| address=/azerty.fr/127.0.0.1 |
| address=/localdomain.fr/127.0.0.1 |
| address=/google-analitics.com/127.0.0.1 |