| 47,7 → 47,7 |
|---|
| $SED "1i\/etc\/dansguardian\/lists\/blacklists\/$ENABLE_CATEGORIE" $BL_CATEGORIES |
| ln -s $DIR_DNS_BL/$ENABLE_CATEGORIE.conf $DIR_DNS_BL_ENABLED/$ENABLE_CATEGORIE |
| ln -s $DIR_IP_BL/$ENABLE_CATEGORIE $DIR_IP_BL_ENABLED/$ENABLE_CATEGORIE |
| echo ".Include<$DIR_DG_BL/$ENABLE_CATEGORIE/domains>" >> $DIR_DG/bannedsitelist # we let DG filters domain in order to prevent bypass by proxy http vpn ;-) |
| # echo ".Include<$DIR_DG_BL/$ENABLE_CATEGORIE/domains>" >> $DIR_DG/bannedsitelist # Blacklisted domains are managed by dnsmasq |
| echo ".Include<$DIR_DG_BL/$ENABLE_CATEGORIE/urls>" >> $DIR_DG/bannedurllist |
| done |
| sort +0.0 -0.2 $BL_CATEGORIES -o $FILE_tmp |
| 131,7 → 131,7 |
|---|
| chown -R apache:apache $DIR_tmp |
| fi |
| ;; |
| # Adapt Toulouse BL to our structure (dnsmasq + DG) |
| # Adapt Toulouse BL to ALCASAR architecture (dnsmasq + DG + iptables) |
| -adapt | --adapt) |
| echo -n "Toulouse BlackList migration process. Please wait : " |
| if [ -f $DIR_tmp/blacklists.tar.gz ] |
| 173,7 → 173,7 |
|---|
| $SED "/^$ENABLE_CATEGORIE$/d" $BL_CATEGORIES_ENABLED |
| fi |
| done |
| # Creation of DNSMASQ BL and WL |
| # Creation of DNSMASQ and Iptables BL and WL |
| for LIST in $BL_CATEGORIES $WL_CATEGORIES # for each list (bl and wl) |
| do |
| for PATH_FILE in `cat $LIST` # for each category |
| 187,9 → 187,9 |
|---|
| fi |
| $SED "s/\.\{2,10\}/\./g" $PATH_FILE/domains $PATH_FILE/urls # correct some syntax errors |
| # retrieve the ip addresses for iptables |
| egrep "([0-9]{1,3}\.){3}[0-9]{1,3}" $PATH_FILE/domains > $FILE_ip_tmp |
| egrep "^([0-9]{1,3}\.){3}[0-9]{1,3}$" $PATH_FILE/domains > $FILE_ip_tmp |
| # for dnsmask, remove IP addesses, accented characters and commented lines. |
| egrep -v "([0-9]{1,3}\.){3}[0-9]{1,3}" $PATH_FILE/domains > $FILE_tmp |
| egrep -v "^([0-9]{1,3}\.){3}[0-9]{1,3}$" $PATH_FILE/domains > $FILE_tmp |
| $SED "/[äâëêïîöôüû]/d" $FILE_tmp |
| $SED "/^#.*/d" $FILE_tmp |
| # adapt to the dnsmasq syntax |