| 18,6 → 18,7 |
|---|
| FILE_ip_tmp="/tmp/filesipfilter.txt" |
| DIR_DG="/etc/e2guardian/lists" |
| DIR_DG_BL="$DIR_DG/blacklists" |
| DIR_DG_GROUP1="$DIR_DG/group1" |
| GLOBAL_USAGE="$DIR_CONF/alcasar-global-usage" # file containing the description of the lists |
| BL_CATEGORIES="$DIR_CONF/alcasar-bl-categories" # list of names of the BL categories |
| WL_CATEGORIES="$DIR_CONF/alcasar-wl-categories" # ' ' WL categories |
| 57,7 → 58,7 |
|---|
| chown root:apache $DIR_CONF/update_cat.conf |
| chmod 660 $DIR_CONF/update_cat.conf |
| fi |
| $SED "/\.Include/d" $DIR_DG/bannedsitelist $DIR_DG/bannedurllist # cleaning for DG |
| $SED "/\.Include/d" $DIR_DG_GROUP1/bannedsitelist $DIR_DG_GROUP1/bannedurllist # cleaning for DG |
| $SED "s?^[^#]?#&?g" $BL_CATEGORIES $WL_CATEGORIES # cleaning BL & WL categories file (comment all lines) |
| |
| # process the file $BL_CATEGORIES with the choice of categories |
| 67,8 → 68,8 |
|---|
| $SED "1i\/etc\/e2guardian\/lists\/blacklists\/$ENABLE_CATEGORIE" $BL_CATEGORIES |
| ln -sf $DIR_DNS_BL/$ENABLE_CATEGORIE.conf $DIR_DNS_BL_ENABLED/$ENABLE_CATEGORIE |
| ln -sf $DIR_IP_BL/$ENABLE_CATEGORIE $DIR_IP_BL_ENABLED/$ENABLE_CATEGORIE |
| # echo ".Include<$DIR_DG_BL/$ENABLE_CATEGORIE/domains>" >> $DIR_DG/bannedsitelist # Blacklisted domains are managed by unbound |
| echo ".Include<$DIR_DG_BL/$ENABLE_CATEGORIE/urls>" >> $DIR_DG/bannedurllist |
| # echo ".Include<$DIR_DG_BL/$ENABLE_CATEGORIE/domains>" >> $DIR_DG_GROUP1/bannedsitelist # Blacklisted domains are managed by unbound |
| echo ".Include<$DIR_DG_BL/$ENABLE_CATEGORIE/urls>" >> $DIR_DG_GROUP1/bannedurllist |
| done |
| sort +0.0 -0.2 $BL_CATEGORIES -o $FILE_tmp |
| mv $FILE_tmp $BL_CATEGORIES |
| 289,7 → 290,7 |
|---|
| cat_choice |
| # for unbound (rehabilitated domain names) |
| rm -f $REHABILITATED_DNS_FILE |
| if [ "$(wc -w $DIR_DG/exceptionsitelist | cut -d " " -f1)" != "0" ] |
| if [ "$(wc -w $DIR_DG_GROUP1/exceptionsitelist | cut -d " " -f1)" != "0" ] |
| then |
| touch $REHABILITATED_DNS_FILE |
| while read -r domain; do |
| 296,7 → 297,7 |
|---|
| [ -z "$domain" ] && continue |
| echo "local-zone: $domain typetransparent" >> $REHABILITATED_DNS_FILE |
| echo "local-zone-tag: $domain \"\"" >> $REHABILITATED_DNS_FILE |
| done < $DIR_DG/exceptionsitelist |
| done < $DIR_DG_GROUP1/exceptionsitelist |
| fi |
| # adapt OSSI BL & WL custom files |
| for dir in $DIR_DNS_BL_ENABLED $DIR_DNS_WL_ENABLED $DIR_IP_BL_ENABLED $DIR_IP_WL_ENABLED $DIR_DNS_BL $DIR_DNS_WL $DIR_IP_BL $DIR_IP_WL |