Subversion Repositories ALCASAR

Compare Revisions

Ignore whitespace Rev 1898 → Rev 1899

/scripts/alcasar-bl.sh
28,11 → 28,16
DIR_DNS_BL="$DIR_SHARE/dnsmasq-bl" # all the BL in the DNSMASQ format
DIR_DNS_WL="$DIR_SHARE/dnsmasq-wl" # all the WL ' ' '
DIR_IP_BL="$DIR_SHARE/iptables-bl" # all the IP addresses of the BL
DIR_IP_WL="$DIR_SHARE/iptables-wl" # IP ossi disabled WL
DIR_DNS_BL_ENABLED="$DIR_SHARE/dnsmasq-bl-enabled" # symbolic link to the domains BL (only enabled categories)
DIR_DNS_WL_ENABLED="$DIR_SHARE/dnsmasq-wl-enabled" # ' ' ' WL ' ' '
DIR_IP_BL_ENABLED="$DIR_SHARE/iptables-bl-enabled" # ' ' ip BL (only enabled categories)
DIR_IP_WL_ENABLED="$DIR_SHARE/iptables-wl-enabled" # ' ' ip WL (ossi and ossi-* imported from ACC)
DIR_IP_WL="$DIR_SHARE/iptables-wl-enabled" # ' ' ip WL (ossi and ossi-* imported from ACC)
tmp_DIR_IP_BL="/tmp/ossi-iptables-bl" #IP BL tmp directory to keep ossi files during an update
tmp_DIR_IP_WL="/tmp/ossi-iptables-wl" #IP WL tmp directory to keep ossi files during an update
tmp_DIR_DNS_BL="/tmp/ossi-dnsmasq-bl" #DNS BL tmp directory to keep ossi files during an update
tmp_DIR_DNS_WL="/tmp/ossi-dnsmasq-wl" #DNS WL tmp directory to keep ossi files during an update
#BL tmp directory to keep ossi files
DNSMASQ_BL_CONF="/etc/dnsmasq-blacklist.conf" # conf file of dnsmasq-blacklist
DNS1=`grep "DNS1" $CONF_FILE | cut -d '=' -f 2` # server DNS1 (for WL domain names)
BL_SERVER="dsi.ut-capitole.fr"
53,7 → 58,7
done
else
mkdir $DIR_IP_BL_ENABLED
chown apache $DIR_IP_BL_ENABLED
chown dansguardian:apache $DIR_IP_BL_ENABLED
fi
66,9 → 71,20
done
else
mkdir $DIR_DNS_BL_ENABLED
chown apache $DIR_DNS_BL_ENABLED
chown dansguardian:apache $DIR_DNS_BL_ENABLED
fi
#ip WL ENABLE
if [ -d $DIR_IP_WL ]
then
for file in `ls -1 $DIR_IP_WL | grep -v "^ossi*"`
do
rm -f $DIR_IP_WL/$file
done
else
mkdir $DIR_IP_WL
chown dansguardian:apache $DIR_IP_WL
fi
#ip WL ENABLE
if [ -d $DIR_IP_WL_ENABLED ]
79,9 → 95,9
done
else
mkdir $DIR_IP_WL_ENABLED
chown apache $DIR_IP_WL_ENABLED
chown dansguardian:apache $DIR_IP_WL_ENABLED
touch $DIR_IP_WL_ENABLED/ossi
chown apache $DIR_IP_WL_ENABLED/ossi
chown dansguardian:apache $DIR_IP_WL_ENABLED/ossi
fi
 
#dns WL ENABLED
93,7 → 109,7
done
else
mkdir $DIR_DNS_WL_ENABLED
chown apache $DIR_DNS_WL_ENABLED
chown dansguardian:apache $DIR_DNS_WL_ENABLED
fi
#dns WL ossi.conf
100,7 → 116,7
if [ ! -e $DIR_DNS_WL/ossi.conf ]
then
touch $DIR_DNS_WL/ossi.conf
chown apache $DIR_DNS_WL/ossi.conf
chown dansguardian:apache $DIR_DNS_WL/ossi.conf
if [ ! -e $DIR_DNS_WL_ENABLED/ossi ]
then
ln -s $DIR_DNS_WL/ossi.conf $DIR_DNS_WL_ENABLED/ossi
181,7 → 197,26
-adapt | --adapt)
echo -n "Adaptation process of Toulouse University blackList. Please wait : "
#to keep ossi files
mkdir $tmp_DIR_IP_BL $tmp_DIR_IP_WL $tmp_DIR_DNS_BL $tmp_DIR_DNS_WL
for x in $(ls -1 $DIR_IP_BL | grep "^ossi*")
do
mv $DIR_IP_BL/$x $tmp_DIR_IP_BL
done
for x in $(ls -1 $DIR_IP_WL | grep "^ossi*")
do
mv $DIR_IP_WL/$x $tmp_DIR_IP_WL
done
for x in $(ls -1 $DIR_DNS_BL | grep "^ossi*")
do
mv $DIR_DNS_BL/$x $tmp_DIR_DNS_BL
done
for x in $(ls -1 $DIR_DNS_WL | grep "^ossi*")
do
mv $DIR_DNS_WL/$x $tmp_DIR_DNS_WL
done
if [ -f $DIR_tmp/blacklists.tar.gz ] # when downloading the last version of the BL
then
[ -d $DIR_DG_BL/ossi ] && mv $DIR_DG_BL/ossi $DIR_tmp
192,11 → 227,11
[ -d $DIR_tmp/ossi ] && mv -f $DIR_tmp/ossi $DIR_DG_BL/
fi
rm -f $BL_CATEGORIES $WL_CATEGORIES $WL_CATEGORIES_ENABLED
rm -rf $DIR_DNS_BL $DIR_DNS_WL $DIR_IP_BL
rm -rf $DIR_DNS_BL $DIR_DNS_WL $DIR_IP_BL $DIR_IP_WL
touch $BL_CATEGORIES $WL_CATEGORIES $WL_CATEGORIES_ENABLED
mkdir $DIR_DNS_BL $DIR_DNS_WL $DIR_IP_BL
chown -R dansguardian:apache $DIR_DG $BL_CATEGORIES $WL_CATEGORIES $BL_CATEGORIES_ENABLED $WL_CATEGORIES_ENABLED
chmod -R g+w $DIR_DG $BL_CATEGORIES $WL_CATEGORIES $BL_CATEGORIES_ENABLED $WL_CATEGORIES_ENABLED
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
find $DIR_DG_BL/ -type f -name domains > $FILE_tmp # retrieve directory name where a domain file exist
$SED "s?\/domains??g" $FILE_tmp # remove "/domains" suffix
for dir_categorie in `cat $FILE_tmp` # create the blacklist and the whitelist files
256,6 → 291,26
# Restoring ossi file of BL IP
[ -e $DIR_tmp/ossi-ip-bl ] && mv $DIR_tmp/ossi-ip-bl $DIR_IP_BL/ossi
rm -rf $DIR_tmp
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
echo
;;
# update the categories which are written in "/usr/local/etc/update_cat.conf" with rsync