| 48,7 → 48,6 |
|---|
| # saving ossi category |
| mkdir $DIR_tmp |
| cp $DIR_IP_BL/ossi $DIR_tmp |
| |
| #ip BL ENABLE |
| if [ -d $DIR_IP_BL_ENABLED ] |
| then |
| 137,9 → 136,9 |
|---|
| 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 "s?^[^#]?#&?g" $BL_CATEGORIES $WL_CATEGORIES # cleaning BL & WL categories file (comment all lines) |
| |
| # process the file $BL_CATEGORIES with the choice of categories |
| for ENABLE_CATEGORIE in `cat $BL_CATEGORIES_ENABLED` |
| do |
| 152,6 → 151,7 |
|---|
| done |
| sort +0.0 -0.2 $BL_CATEGORIES -o $FILE_tmp |
| mv $FILE_tmp $BL_CATEGORIES |
| |
| # process the file $WL_CATEGORIES with the choice of categories |
| for ENABLE_CATEGORIE in `cat $WL_CATEGORIES_ENABLED` |
| do |
| 161,12 → 161,11 |
|---|
| 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 }" |
| 203,37 → 202,28 |
|---|
| # Adapt Toulouse University BL to ALCASAR architecture (dnsmasq + DG + iptables) |
| -adapt | --adapt) |
| echo -n "Adaptation process of Toulouse University blackList. Please wait : " |
| |
| #to keep ossi files |
| if [ -d $DIR_IP_BL -a -d $DIR_IP_WL -a -d $DIR_DNS_BL -a -d $DIR_DNS_WL ] |
| then |
| 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 |
| fi |
| |
| # keep custom files (ossi) |
| 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 |
| [ -e $DIR_IP_BL/ossi ] && mv $DIR_IP_BL/ossi $DIR_tmp/ossi-ip-bl |
| rm -rf $DIR_DG_BL $DIR_IP_BL |
| mkdir $DIR_DG_BL $DIR_IP_BL |
| tar zxf $DIR_tmp/blacklists.tar.gz --directory=$DIR_DG/ |
| [ -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 $DIR_IP_WL |
| 297,10 → 287,8 |
|---|
| done |
| done |
| rm -f $FILE_tmp $FILE_ip_tmp |
| # Restoring ossi file of BL IP |
| [ -e $DIR_tmp/ossi-ip-bl ] && mv $DIR_tmp/ossi-ip-bl $DIR_IP_BL/ossi |
| # 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*") |
| 319,10 → 307,8 |
|---|
| 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 |