| 137,7 → 137,7 |
|---|
| |
| } |
| |
| usage="Usage: alcasar-bl.sh { -cat_choice or --cat_choice } | { -download or --download } | { -adapt or --adapt } | { -reload or --reload }" |
| usage="Usage: alcasar-bl.sh { -cat_choice or --cat_choice } | { -download or --download } | { -adapt or --adapt } | { -reload or --reload } | { -update_cat or --update_cat } & categorie & url_rsync" |
| nb_args=$# |
| args=$1 |
| if [ $nb_args -eq 0 ] |
| 225,7 → 225,7 |
|---|
| fi |
| $SED "s/\.\{2,10\}/\./g" $PATH_FILE/domains $PATH_FILE/urls # correct some syntax errors |
| # extract ip addresses for iptables |
| awk '/^([0-9]{1,3}\.){3}[0-9]{1,3}$/{print "add blacklist_ip_blocked " $0}' $PATH_FILE/domains > $FILE_ip_tmp |
| awk '/^([0-9]{1,3}\.){3}[0-9]{1,3}$/{print "add bl_ip_blocked " $0}' $PATH_FILE/domains > $FILE_ip_tmp |
| # for dnsmask, remove IP addesses, accented characters and commented lines. |
| egrep -v "^([0-9]{1,3}\.){3}[0-9]{1,3}$" $PATH_FILE/domains > $FILE_tmp |
| $SED "/[äâëêïîöôüû]/d" $FILE_tmp |
| 249,6 → 249,52 |
|---|
| rm -rf $DIR_tmp |
| echo |
| ;; |
| #mise a jour d'une categorie avec rsync |
| -update_cat | --update_cat) |
| |
| if [ $# -ge 3 ] |
| then |
| echo -n "Updating $2 category ..." |
| |
| PATH_FILE=$(find $DIR_DG_BL/ -type d -name $2) # retrieve directory name of the category |
| rsync -rv $3 $(dirname $PATH_FILE ) #rsync inside of the blacklist directory |
| |
| # Creation of DNSMASQ and Iptables BL and WL |
| DOMAINE=$(basename $PATH_FILE) |
| |
| $SED "s/\.\{2,10\}/\./g" $PATH_FILE/domains $PATH_FILE/urls # correct some syntax errors |
| # extract ip addresses for iptables |
| awk '/^([0-9]{1,3}\.){3}[0-9]{1,3}$/{print "add bl_ip_blocked " $0}' $PATH_FILE/domains > $FILE_ip_tmp |
| # for dnsmask, remove IP addesses, accented characters and commented lines. |
| egrep -v "^([0-9]{1,3}\.){3}[0-9]{1,3}$" $PATH_FILE/domains > $FILE_tmp |
| $SED "/[äâëêïîöôüû]/d" $FILE_tmp |
| $SED "/^#.*/d" $FILE_tmp |
| |
| black=`grep black $PATH_FILE/usage |wc -l` |
| if [ $black == "1" ] |
| then |
| # adapt to the dnsmasq syntax for the blacklist |
| $SED "s?.*?address=/&/$PRIVATE_IP?g" $FILE_tmp |
| mv $FILE_tmp $DIR_DNS_BL/$DOMAINE.conf |
| mv $FILE_ip_tmp $DIR_IP_BL/$DOMAINE |
| /usr/bin/systemctl restart dnsmasq-blacklist |
| else |
| # adapt to the dnsmasq syntax for the whitelist |
| $SED "s?.*?server=/&/$DNS1?g" $FILE_tmp |
| mv $FILE_tmp $DIR_DNS_WL/$DOMAINE.conf |
| /usr/bin/systemctl restart dnsmasq-whitelist |
| fi |
| |
| rm -f $FILE_tmp $FILE_ip_tmp |
| /usr/bin/systemctl restart dansguardian |
| /usr/local/bin/alcasar-iptables.sh |
| |
| echo "MAJ RSYNC réussie" |
| |
| else |
| echo "$usage" |
| fi |
| ;; |
| # reload when categories are changed |
| -reload | --reload) |
| # for DG |
| 279,3 → 325,4 |
|---|
| esac |
| |
| |
| |