21,7 → 21,7 |
DIR_DG="/etc/dansguardian/lists" |
DIR_DG_BL="$DIR_DG/blacklists" |
BL_CATEGORIES="$DIR_CONF/alcasar-bl-categories" # list of names of the BL categories |
WL_CATEGORIES="$DIR_CONF/alcasar-wl-categories" #' ' WL ' |
WL_CATEGORIES="$DIR_CONF/alcasar-wl-categories" # ' ' WL categories |
BL_CATEGORIES_ENABLED="$DIR_CONF/alcasar-bl-categories-enabled" # ' ' BL enabled categories |
WL_CATEGORIES_ENABLED="$DIR_CONF/alcasar-wl-categories-enabled" # ' ' WL enabled categories |
DIR_SHARE="/usr/local/share" |
206,10 → 206,9 |
do |
mv $DIR_tmp/$x $DIR_DG_BL |
done |
|
rm -f $BL_CATEGORIES $WL_CATEGORIES $WL_CATEGORIES_ENABLED |
rm -f $BL_CATEGORIES $WL_CATEGORIES |
rm -rf $DIR_DNS_BL $DIR_DNS_WL $DIR_IP_BL $DIR_IP_WL |
touch $BL_CATEGORIES $WL_CATEGORIES $WL_CATEGORIES_ENABLED |
touch $BL_CATEGORIES $WL_CATEGORIES |
mkdir $DIR_DNS_BL $DIR_DNS_WL $DIR_IP_BL $DIR_IP_WL |
chown -R dansguardian:apache $DIR_DG $BL_CATEGORIES $WL_CATEGORIES $BL_CATEGORIES_ENABLED $WL_CATEGORIES_ENABLED $DIR_DNS_BL $DIR_DNS_WL $DIR_IP_BL $DIR_IP_WL |
chmod -R g+w $DIR_DG $BL_CATEGORIES $WL_CATEGORIES $BL_CATEGORIES_ENABLED $WL_CATEGORIES_ENABLED $DIR_DNS_BL $DIR_DNS_WL $DIR_IP_BL $DIR_IP_WL |
222,9 → 221,8 |
if [ "$categorie_type" == "white" ] |
then |
echo "$dir_categorie" >> $WL_CATEGORIES |
echo `basename $dir_categorie` >> $WL_CATEGORIES_ENABLED # by default all WL are enabled |
fi |
echo "$dir_categorie" >> $BL_CATEGORIES # By default all categories are in BL |
echo "$dir_categorie" >> $BL_CATEGORIES |
done |
rm -f $FILE_tmp |
# Verify that the enabled categories are effectively in the BL (need after an update of the BL) |
236,6 → 234,15 |
$SED "/^$ENABLE_CATEGORIE$/d" $BL_CATEGORIES_ENABLED |
fi |
done |
# Verify that the enabled categories are effectively in the WL (need after an update of the WL) |
for ENABLE_CATEGORIE in `cat $WL_CATEGORIES_ENABLED` |
do |
ok=`grep /$ENABLE_CATEGORIE$ $WL_CATEGORIES|wc -l` |
if [ $ok != "1" ] |
then |
$SED "/^$ENABLE_CATEGORIE$/d" $WL_CATEGORIES_ENABLED |
fi |
done |
# Creation of DNSMASQ and Iptables BL and WL |
for LIST in $BL_CATEGORIES $WL_CATEGORIES # for each list (bl and wl) |
do |
269,29 → 276,7 |
done |
done |
rm -f $FILE_tmp $FILE_ip_tmp |
# Restoring custom files (ossi) |
rm -rf $DIR_tmp |
if [ -d $tmp_DIR_IP_BL -a -d $tmp_DIR_IP_WL -a -d $tmp_DIR_DNS_BL -a -d $tmp_DIR_DNS_WL ] |
then |
for x in $(ls -1 $tmp_DIR_IP_BL | grep "^ossi*") |
do |
mv $tmp_DIR_IP_BL/$x $DIR_IP_BL |
done |
for x in $(ls -1 $tmp_DIR_IP_WL | grep "^ossi*") |
do |
mv $tmp_DIR_IP_WL/$x $DIR_IP_WL |
done |
for x in $(ls -1 $tmp_DIR_DNS_BL | grep "^ossi*") |
do |
mv $tmp_DIR_DNS_BL/$x $DIR_DNS_BL |
done |
for x in $(ls -1 $tmp_DIR_DNS_WL | grep "^ossi*") |
do |
mv $tmp_DIR_DNS_WL/$x $DIR_DNS_WL |
done |
rm -rf $tmp_DIR_IP_BL $tmp_DIR_IP_WL $tmp_DIR_DNS_BL $tmp_DIR_DNS_WL |
fi |
echo |
;; |
# update the categories which are written in "/usr/local/etc/update_cat.conf" with rsync |
-update_cat | --update_cat) |