| 45,9 → 45,7 |
|---|
| |
| # enable/disable the BL & WL categories |
| function cat_choice (){ |
| # saving ossi category |
| mkdir $DIR_tmp |
| cp $DIR_IP_BL/ossi $DIR_tmp |
| #ip BL ENABLE |
| if [ -d $DIR_IP_BL_ENABLED ] |
| then |
| 57,11 → 55,10 |
|---|
| done |
| else |
| mkdir $DIR_IP_BL_ENABLED |
| chown dansguardian:apache $DIR_IP_BL_ENABLED |
| chmod g+w $DIR_IP_BL_ENABLED |
| chown root:apache $DIR_IP_BL_ENABLED |
| chmod 770 $DIR_IP_BL_ENABLED |
| fi |
| |
| |
| |
| #dns BL ENABLED |
| if [ -d $DIR_DNS_BL_ENABLED ] |
| then |
| 71,23 → 68,21 |
|---|
| done |
| else |
| mkdir $DIR_DNS_BL_ENABLED |
| chown dansguardian:apache $DIR_DNS_BL_ENABLED |
| chmod g+w $DIR_DNS_BL_ENABLED |
| chown root:apache $DIR_DNS_BL_ENABLED |
| chmod 770 $DIR_DNS_BL_ENABLED |
| fi |
| |
| #ip WL ENABLE |
| if [ -d $DIR_IP_WL ] |
| #dns BL ossi.conf |
| if [ ! -e $DIR_DNS_BL/ossi.conf ] |
| 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 |
| chmod g+w $DIR_IP_WL |
| touch $DIR_DNS_BL/ossi.conf |
| chown root:apache $DIR_DNS_BL/ossi.conf |
| chmod g+w $DIR_DNS_BL/ossi.conf |
| if [ ! -e $DIR_DNS_BL_ENABLED/ossi ] |
| then |
| ln -s $DIR_DNS_BL/ossi.conf $DIR_DNS_BL_ENABLED/ossi |
| fi |
| fi |
| |
| |
| #ip WL ENABLE |
| if [ -d $DIR_IP_WL_ENABLED ] |
| then |
| 97,10 → 92,9 |
|---|
| done |
| else |
| mkdir $DIR_IP_WL_ENABLED |
| chown dansguardian:apache $DIR_IP_WL_ENABLED |
| chmod g+w $DIR_IP_WL_ENABLED |
| touch $DIR_IP_WL_ENABLED/ossi |
| chown dansguardian:apache $DIR_IP_WL_ENABLED/ossi |
| chown -R root:apache $DIR_IP_WL_ENABLED |
| chmod 770 $DIR_IP_WL_ENABLED |
| chmod g+w $DIR_IP_WL_ENABLED/ossi |
| fi |
| |
| 113,19 → 107,18 |
|---|
| done |
| else |
| mkdir $DIR_DNS_WL_ENABLED |
| chown dansguardian:apache $DIR_DNS_WL_ENABLED |
| chmod g+w $DIR_DNS_WL_ENABLED |
| chown root:apache $DIR_DNS_WL_ENABLED |
| chmod 770 $DIR_DNS_WL_ENABLED |
| fi |
| |
| #dns WL ossi.conf |
| if [ ! -e $DIR_DNS_WL/ossi.conf ] |
| then |
| touch $DIR_DNS_WL/ossi.conf |
| chown dansguardian:apache $DIR_DNS_WL/ossi.conf |
| chown root:apache $DIR_DNS_WL/ossi.conf |
| chmod g+w $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 |
| ln -s $DIR_DNS_WL/ossi.conf $DIR_DNS_WL_ENABLED/ossi |
| fi |
| fi |
| |
| 202,23 → 195,26 |
|---|
| # 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) |
| 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 |
| # 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 |
| if [ -f $DIR_tmp/blacklists.tar.gz ] # when downloading the last version of the BL |
| then |
| rm -rf $DIR_DG_BL $DIR_IP_BL |