154,11 → 154,6 |
done |
sort +0.0 -0.2 $WL_CATEGORIES -o $FILE_tmp |
mv $FILE_tmp $WL_CATEGORIES |
|
# restoring ip files and ossi category BL/WL |
mv $DIR_tmp/ossi $DIR_IP_BL |
chown apache $DIR_IP_BL/ossi |
rm -rf $DIR_tmp |
} |
|
usage="Usage: alcasar-bl.sh { -cat_choice or --cat_choice } | { -download or --download } | { -adapt or --adapt } | { -reload or --reload } | { -update_cat or --update_cat }" |
195,26 → 190,11 |
# Adapt Toulouse University BL to ALCASAR architecture (dnsmasq + DG + iptables) |
-adapt | --adapt) |
echo -n "Adaptation process of Toulouse University blackList. Please wait : " |
# keep custom files (ossi) only when updating he BL |
if [ -d $DIR_IP_BL -a -d $DIR_IP_WL -a -d $DIR_DNS_BL -a -d $DIR_DNS_WL ] |
then |
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 |
fi |
# keep custom files (ossi) |
for x in $(ls -1 $DIR_DG_BL | grep "^ossi-*") |
do |
mv $DIR_DG_BL/$x $DIR_tmp |
done |
if [ -f $DIR_tmp/blacklists.tar.gz ] # when downloading the last version of the BL |
then |
rm -rf $DIR_DG_BL $DIR_IP_BL |
221,6 → 201,12 |
mkdir $DIR_DG_BL $DIR_IP_BL |
tar zxf $DIR_tmp/blacklists.tar.gz --directory=$DIR_DG/ |
fi |
# Retrieve custom files (ossi) |
for x in $(ls -1 $DIR_tmp | grep "^ossi-*") |
do |
mv $DIR_tmp/$x $DIR_DG_BL |
done |
|
rm -f $BL_CATEGORIES $WL_CATEGORIES $WL_CATEGORIES_ENABLED |
rm -rf $DIR_DNS_BL $DIR_DNS_WL $DIR_IP_BL $DIR_IP_WL |
touch $BL_CATEGORIES $WL_CATEGORIES $WL_CATEGORIES_ENABLED |