WebSVN – ALCASAR – Diff – /scripts/alcasar-bl.sh


#/bin/sh
# $Id: alcasar-bl.sh 634 2011-06-13 17:23:46Z richard $
 
# Script de gestion de la BL pour le filtrage de domaine (via dnsmasq) et d'URL (via dansguardian)
# By 3abtux & rexy
 
CONF_FILE="/usr/local/etc/alcasar.conf"
DIR_tmp="/tmp/blacklists"
FILE_tmp="/tmp/fileFilter.txt"
DIR_DG="/etc/dansguardian/lists"
DIR_DG_BL="$DIR_DG/blacklists"
BL_CATEGORIES="/usr/local/etc/alcasar-bl-categories"
BL_CATEGORIES_ENABLED="/usr/local/etc/alcasar-bl-categories-enabled"
DIR_DNS_FILTER_AVAILABLE="/usr/local/etc/alcasar-dnsfilter-available"
DIR_DNS_FILTER_ENABLED="/usr/local/etc/alcasar-dnsfilter-enabled"
IP_RETOUR="20.0.0.1"
BL_SERVER="cri.univ-tlse1.fr"
SED="/bin/sed -i"
# Récupération de l'archive de la BL Toulouse
function transfert () {
	mkdir -p $DIR_tmp
	cd $DIR_tmp
	wget http://$BL_SERVER/blacklists/download/blacklists.tar.gz
}
 
# Décompression de la BL (en conservant la WL)
function install () {
	[ -d $DIR_DG ] || mkdir -p $DIR_DG
	[ -d $DIR_DG_BL/ossi ] && mv -f $DIR_DG_BL/ossi $DIR_tmp
	tar zxf $DIR_tmp/blacklists.tar.gz --directory=$DIR_DG/
	[ -d $DIR_tmp/ossi ] && mv -f $DIR_tmp/ossi $DIR_DG_BL/
	cd /root
	rm -rf $DIR_tmp
}
 
# Adaptation de la BL Toulouse à la structure Dnsmasq
function adapt () {
	# On récupère le nom des répertoire (catégories)
	find $DIR_DG_BL/ -type f -name domains > $BL_CATEGORIES
	# On supprime le suffice "/domains"
	$SED "s?\/domains??g" $BL_CATEGORIES
	rm -f $DIR_DNS_FILTER_AVAILABLE/*
	echo -n "Toulouse BlackList migration process. Please wait : "
	# pour chaque catégorie
	for PATH_FILE in `cat $BL_CATEGORIES`
	do
		echo -n "."
		# on crée le le fichier 'urls' s'il n'existe pas
		if [ ! -f $PATH_FILE/urls ]
		then
			touch $PATH_FILE/urls
			chown dansguardian:apache $PATH_FILE/urls
		fi
		# on suppression des @IP, des lignes commentées et des caractères bizarres comme les ô et û ö ü
		egrep  -v "([0-9]{1,3}\.){3}[0-9]{1,3}" $PATH_FILE/domains > /tmp/dnsmasq-bl.tmp
		$SED "/[äâëêïîöôüû]/d" /tmp/dnsmasq-bl.tmp
		$SED "/^#.*/d" /tmp/dnsmasq-bl.tmp
		# Mise en forme dnsmasq
		$SED "s?.*?address=/&/$IP_RETOUR?g" /tmp/dnsmasq-bl.tmp
        	DOMAINE=`basename $PATH_FILE`
		mv /tmp/dnsmasq-bl.tmp $DIR_DNS_FILTER_AVAILABLE/$DOMAINE.conf
	done
	echo
}
 
# Permet d'activer/désactiver les catégories de la BL
function cat_choice (){
	# un peu de ménage
	rm -rf $DIR_DNS_FILTER_ENABLED/*
	$SED "/\.Include/d" $DIR_DG/bannedsitelist $DIR_DG/bannedurllist
	# on adapte le fichier $BL_CATEGORIES au choix de catégorie 
	$SED "s?^[^#]?#&?g" $BL_CATEGORIES # on commente ce qui ne l'est pas
	for ENABLE_CATEGORIE in `cat $BL_CATEGORIES_ENABLED`
	do
		$SED "/\/$ENABLE_CATEGORIE$/d" $BL_CATEGORIES
		$SED "1i\/etc\/dansguardian\/lists\/blacklists\/$ENABLE_CATEGORIE" $BL_CATEGORIES
	done
	sort -k2n $BL_CATEGORIES > $FILE_tmp
	mv $FILE_tmp $BL_CATEGORIES
	# on affecte les catégories à dansguardian et dnsmasq
	for i in `cat $BL_CATEGORIES_ENABLED`
		do
		ln -s $DIR_DNS_FILTER_AVAILABLE/$i.conf $DIR_DNS_FILTER_ENABLED/$i
		# echo ".Include<$DIR_DANSGUARDIAN/blacklists/$i/domains>" >> $DIR_DANSGUARDIAN/bannedsitelist
		echo ".Include<$DIR_DG_BL/$i/urls>" >> $DIR_DG/bannedurllist
		done
}
function bl_enable (){
	$SED "s/^reportinglevel =.*/reportinglevel = 3/g" /etc/dansguardian/dansguardian.conf
	$SED "s?^#\"?\"?g" $DIR_DG/urlregexplist # Enable 'safesearch'
	if [ "$PARENT_SCRIPT" != "/usr/local/bin/alcasar-conf.sh" ] # don't launch on install stage
	then
		service dansguardian restart
		service dnsmasq restart
		/usr/local/bin/alcasar-iptables.sh
	fi
}
function bl_disable (){
	rm -rf $DIR_DNS_FILTER_ENABLED/*
	$SED "s/^reportinglevel =.*/reportinglevel = -1/g" /etc/dansguardian/dansguardian.conf
	$SED "s?^[^#]?#&?g" $DIR_DG/urlregexplist # Disable 'safesearch'
	if [ "$PARENT_SCRIPT" != "/usr/local/bin/alcasar-conf.sh" ] # don't launch on install stage
	then
		service dansguardian restart
		service dnsmasq restart
		/usr/local/bin/alcasar-iptables.sh
	fi
}
usage="Usage: alcasar-bl.sh {-on or --on} | { -off or --off } | { -download or --download } | { -reload or --reload }"
nb_args=$#
args=$1
if [ $nb_args -eq 0 ]
then
	DNS_FILTERING=`grep DNS_FILTERING $CONF_FILE|cut -d"=" -f2`		# DNS and URLs filter (on/off)
	DNS_FILTERING=${DNS_FILTERING:=off}
	echo "Set BlackList Filtering to $DNS_FILTERING"
	if [ $DNS_FILTERING = on ]; then
		cat_choice
		bl_enable
	else
		bl_disable
	fi
	exit 0
fi
case $args in
	-\? | -h* | --h*)
		echo "$usage"
		exit 0
		;;
	# activation du filtrage
	-on | --on)	
		cat_choice
		$SED "s?^DNS_FILTERING.*?DNS_FILTERING=on?g" $CONF_FILE
		bl_enable
		;;
	# désactivation du filtrage
	-off | --off)
		$SED "s?^DNS_FILTERING.*?DNS_FILTERING=off?g" $CONF_FILE
		bl_disable
		;;
 
 
 
 
 
 
 
 
 
 
	# Mise a jour de la blacklist 'Toulouse' et adaptation à dansguardian et dnsmasq
	-download | --download)
		rm -rf /tmp/con_ok.html
		`/usr/bin/curl $BL_SERVER -# -o /tmp/con_ok.html`
		if [ ! -e /tmp/con_ok.html ]
		then
			echo "Erreur : le serveur de blacklist ($BL_SERVER) n'est pas joignable"
		else 
			transfert
			install
			chown -R dansguardian:apache $DIR_DG
			chmod -R g+w $DIR_DG
			DATE=`date '+%d %B %Y - %Hh%M'`
			echo "Univ-tlse du $DATE " > /var/www/html/VERSION-BL
			rm -rf /tmp/con_ok.html
		fi
		adapt
		;;		
	# regénération suite à modification (choix catégories ou BL secondaire)
	-reload | --reload)
		adapt
		# pour Dansguardian
		chown -R dansguardian:apache $DIR_DG_BL/ossi
		chmod -R g+w $DIR_DG_BL/ossi
		cat_choice
 
		# pour dnsmasq (noms de domaine réhabilités)
		if [ `wc -w $DIR_DG/exceptionsitelist|cut -d " " -f1` != "0" ]
		then
			for i in `cat $DIR_DG/exceptionsitelist`
			do
				$SED "/$i/d" $DIR_DNS_FILTER_AVAILABLE/*
			done
		fi
		cp -f $DIR_DG_BL/ossi/domains $DIR_DNS_FILTER_AVAILABLE/ossi.conf
		$SED "s?.*?address=/&/$IP_RETOUR?g" $DIR_DNS_FILTER_AVAILABLE/ossi.conf
		DNS_FILTERING=`grep DNS_FILTERING $CONF_FILE|cut -d"=" -f2`		# DNS and URLs filter (on/off)
		DNS_FILTERING=${DNS_FILTERING:=off}
		if [ $DNS_FILTERING = on ]; then
			bl_enable
		else
			bl_disable
		fi
		;;
	*)
		echo "Argument inconnu :$1";
		echo "$usage"
		exit 1
		;;
esac
 
 

Rev 615	Rev 634
1	`#/bin/sh`	1	`#/bin/sh`
2	`# $Id: alcasar-bl.sh 615 2011-05-24 21:47:25Z richard $`	2	`# $Id: alcasar-bl.sh 634 2011-06-13 17:23:46Z richard $`
3		3
4	`# Script de gestion de la BL pour le filtrage de domaine (via dnsmasq) et d'URL (via dansguardian)`	4	`# Script de gestion de la BL pour le filtrage de domaine (via dnsmasq) et d'URL (via dansguardian)`
5	`# By 3abtux & rexy`	5	`# By 3abtux & rexy`
6		6
7	`CONF_FILE="/usr/local/etc/alcasar.conf"`	7	`CONF_FILE="/usr/local/etc/alcasar.conf"`
8	`DIR_tmp="/tmp/blacklists"`	8	`DIR_tmp="/tmp/blacklists"`
9	`FILE_tmp="/tmp/fileFilter.txt"`	9	`FILE_tmp="/tmp/fileFilter.txt"`
10	`DIR_DG="/etc/dansguardian/lists"`	10	`DIR_DG="/etc/dansguardian/lists"`
11	`DIR_DG_BL="$DIR_DG/blacklists"`	11	`DIR_DG_BL="$DIR_DG/blacklists"`
12	`BL_CATEGORIES="/usr/local/etc/alcasar-bl-categories"`	12	`BL_CATEGORIES="/usr/local/etc/alcasar-bl-categories"`
13	`BL_CATEGORIES_ENABLED="/usr/local/etc/alcasar-bl-categories-enabled"`	13	`BL_CATEGORIES_ENABLED="/usr/local/etc/alcasar-bl-categories-enabled"`
14	`DIR_DNS_FILTER_AVAILABLE="/usr/local/etc/alcasar-dnsfilter-available"`	14	`DIR_DNS_FILTER_AVAILABLE="/usr/local/etc/alcasar-dnsfilter-available"`
15	`DIR_DNS_FILTER_ENABLED="/usr/local/etc/alcasar-dnsfilter-enabled"`	15	`DIR_DNS_FILTER_ENABLED="/usr/local/etc/alcasar-dnsfilter-enabled"`
16	`IP_RETOUR="192.168.182.1"`	16	`IP_RETOUR="20.0.0.1"`
17	`BL_SERVER="cri.univ-tlse1.fr"`	17	`BL_SERVER="cri.univ-tlse1.fr"`
18	`SED="/bin/sed -i"`	18	`SED="/bin/sed -i"`
19	`# Récupération de l'archive de la BL Toulouse`	19	`# Récupération de l'archive de la BL Toulouse`
20	`function transfert () {`	20	`function transfert () {`
21	`mkdir -p $DIR_tmp`	21	`mkdir -p $DIR_tmp`
22	`cd $DIR_tmp`	22	`cd $DIR_tmp`
23	`wget http://$BL_SERVER/blacklists/download/blacklists.tar.gz`	23	`wget http://$BL_SERVER/blacklists/download/blacklists.tar.gz`
24	`}`	24	`}`
25		25
26	`# Décompression de la BL (en conservant la WL)`	26	`# Décompression de la BL (en conservant la WL)`
27	`function install () {`	27	`function install () {`
28	`[ -d $DIR_DG ] \|\| mkdir -p $DIR_DG`	28	`[ -d $DIR_DG ] \|\| mkdir -p $DIR_DG`
29	`[ -d $DIR_DG_BL/ossi ] && mv -f $DIR_DG_BL/ossi $DIR_tmp`	29	`[ -d $DIR_DG_BL/ossi ] && mv -f $DIR_DG_BL/ossi $DIR_tmp`
30	`tar zxf $DIR_tmp/blacklists.tar.gz --directory=$DIR_DG/`	30	`tar zxf $DIR_tmp/blacklists.tar.gz --directory=$DIR_DG/`
31	`[ -d $DIR_tmp/ossi ] && mv -f $DIR_tmp/ossi $DIR_DG_BL/`	31	`[ -d $DIR_tmp/ossi ] && mv -f $DIR_tmp/ossi $DIR_DG_BL/`
32	`cd /root`	32	`cd /root`
33	`rm -rf $DIR_tmp`	33	`rm -rf $DIR_tmp`
34	`}`	34	`}`
35		35
36	`# Adaptation de la BL Toulouse à la structure Dnsmasq`	36	`# Adaptation de la BL Toulouse à la structure Dnsmasq`
37	`function adapt () {`	37	`function adapt () {`
38	`# On récupère le nom des répertoire (catégories)`	38	`# On récupère le nom des répertoire (catégories)`
39	`find $DIR_DG_BL/ -type f -name domains > $BL_CATEGORIES`	39	`find $DIR_DG_BL/ -type f -name domains > $BL_CATEGORIES`
40	`# On supprime le suffice "/domains"`	40	`# On supprime le suffice "/domains"`
41	`$SED "s?\/domains??g" $BL_CATEGORIES`	41	`$SED "s?\/domains??g" $BL_CATEGORIES`
42	`rm -f $DIR_DNS_FILTER_AVAILABLE/*`	42	`rm -f $DIR_DNS_FILTER_AVAILABLE/*`
43	`echo -n "Toulouse BlackList migration process. Please wait : "`	43	`echo -n "Toulouse BlackList migration process. Please wait : "`
44	`# pour chaque catégorie`	44	`# pour chaque catégorie`
45	for PATH_FILE in `cat $BL_CATEGORIES`	45	for PATH_FILE in `cat $BL_CATEGORIES`
46	`do`	46	`do`
47	`echo -n "."`	47	`echo -n "."`
48	`# on crée le le fichier 'urls' s'il n'existe pas`	48	`# on crée le le fichier 'urls' s'il n'existe pas`
49	`if [ ! -f $PATH_FILE/urls ]`	49	`if [ ! -f $PATH_FILE/urls ]`
50	`then`	50	`then`
51	`touch $PATH_FILE/urls`	51	`touch $PATH_FILE/urls`
52	`chown dansguardian:apache $PATH_FILE/urls`	52	`chown dansguardian:apache $PATH_FILE/urls`
53	`fi`	53	`fi`
54	`# on suppression des @IP, des lignes commentées et des caractères bizarres comme les ô et û ö ü`	54	`# on suppression des @IP, des lignes commentées et des caractères bizarres comme les ô et û ö ü`
55	`egrep -v "([0-9]{1,3}\.){3}[0-9]{1,3}" $PATH_FILE/domains > /tmp/dnsmasq-bl.tmp`	55	`egrep -v "([0-9]{1,3}\.){3}[0-9]{1,3}" $PATH_FILE/domains > /tmp/dnsmasq-bl.tmp`
56	`$SED "/[äâëêïîöôüû]/d" /tmp/dnsmasq-bl.tmp`	56	`$SED "/[äâëêïîöôüû]/d" /tmp/dnsmasq-bl.tmp`
57	`$SED "/^#.*/d" /tmp/dnsmasq-bl.tmp`	57	`$SED "/^#.*/d" /tmp/dnsmasq-bl.tmp`
58	`# Mise en forme dnsmasq`	58	`# Mise en forme dnsmasq`
59	`$SED "s?.*?address=/&/$IP_RETOUR?g" /tmp/dnsmasq-bl.tmp`	59	`$SED "s?.*?address=/&/$IP_RETOUR?g" /tmp/dnsmasq-bl.tmp`
60	DOMAINE=`basename $PATH_FILE`	60	DOMAINE=`basename $PATH_FILE`
61	`mv /tmp/dnsmasq-bl.tmp $DIR_DNS_FILTER_AVAILABLE/$DOMAINE.conf`	61	`mv /tmp/dnsmasq-bl.tmp $DIR_DNS_FILTER_AVAILABLE/$DOMAINE.conf`
62	`done`	62	`done`
63	`echo`	63	`echo`
64	`}`	64	`}`
65		65
66	`# Permet d'activer/désactiver les catégories de la BL`	66	`# Permet d'activer/désactiver les catégories de la BL`
67	`function cat_choice (){`	67	`function cat_choice (){`
68	`# un peu de ménage`	68	`# un peu de ménage`
69	`rm -rf $DIR_DNS_FILTER_ENABLED/*`	69	`rm -rf $DIR_DNS_FILTER_ENABLED/*`
70	`$SED "/\.Include/d" $DIR_DG/bannedsitelist $DIR_DG/bannedurllist`	70	`$SED "/\.Include/d" $DIR_DG/bannedsitelist $DIR_DG/bannedurllist`
71	`# on adapte le fichier $BL_CATEGORIES au choix de catégorie`	71	`# on adapte le fichier $BL_CATEGORIES au choix de catégorie`
72	`$SED "s?^[^#]?#&?g" $BL_CATEGORIES # on commente ce qui ne l'est pas`	72	`$SED "s?^[^#]?#&?g" $BL_CATEGORIES # on commente ce qui ne l'est pas`
73	for ENABLE_CATEGORIE in `cat $BL_CATEGORIES_ENABLED`	73	for ENABLE_CATEGORIE in `cat $BL_CATEGORIES_ENABLED`
74	`do`	74	`do`
75	`$SED "/\/$ENABLE_CATEGORIE$/d" $BL_CATEGORIES`	75	`$SED "/\/$ENABLE_CATEGORIE$/d" $BL_CATEGORIES`
76	`$SED "1i\/etc\/dansguardian\/lists\/blacklists\/$ENABLE_CATEGORIE" $BL_CATEGORIES`	76	`$SED "1i\/etc\/dansguardian\/lists\/blacklists\/$ENABLE_CATEGORIE" $BL_CATEGORIES`
77	`done`	77	`done`
78	`sort -k2n $BL_CATEGORIES > $FILE_tmp`	78	`sort -k2n $BL_CATEGORIES > $FILE_tmp`
79	`mv $FILE_tmp $BL_CATEGORIES`	79	`mv $FILE_tmp $BL_CATEGORIES`
80	`# on affecte les catégories à dansguardian et dnsmasq`	80	`# on affecte les catégories à dansguardian et dnsmasq`
81	for i in `cat $BL_CATEGORIES_ENABLED`	81	for i in `cat $BL_CATEGORIES_ENABLED`
82	`do`	82	`do`
83	`ln -s $DIR_DNS_FILTER_AVAILABLE/$i.conf $DIR_DNS_FILTER_ENABLED/$i`	83	`ln -s $DIR_DNS_FILTER_AVAILABLE/$i.conf $DIR_DNS_FILTER_ENABLED/$i`
84	`# echo ".Include<$DIR_DANSGUARDIAN/blacklists/$i/domains>" >> $DIR_DANSGUARDIAN/bannedsitelist`	84	`# echo ".Include<$DIR_DANSGUARDIAN/blacklists/$i/domains>" >> $DIR_DANSGUARDIAN/bannedsitelist`
85	`echo ".Include<$DIR_DG_BL/$i/urls>" >> $DIR_DG/bannedurllist`	85	`echo ".Include<$DIR_DG_BL/$i/urls>" >> $DIR_DG/bannedurllist`
86	`done`	86	`done`
87	`}`	87	`}`
88	`function bl_enable (){`	88	`function bl_enable (){`
89	`$SED "s/^reportinglevel =.*/reportinglevel = 3/g" /etc/dansguardian/dansguardian.conf`	89	`$SED "s/^reportinglevel =.*/reportinglevel = 3/g" /etc/dansguardian/dansguardian.conf`
90	`$SED "s?^#\"?\"?g" $DIR_DG/urlregexplist # Enable 'safesearch'`	90	`$SED "s?^#\"?\"?g" $DIR_DG/urlregexplist # Enable 'safesearch'`
91	`if [ "$PARENT_SCRIPT" != "/usr/local/bin/alcasar-conf.sh" ] # don't launch on install stage`	91	`if [ "$PARENT_SCRIPT" != "/usr/local/bin/alcasar-conf.sh" ] # don't launch on install stage`
92	`then`	92	`then`
93	`service dansguardian restart`	93	`service dansguardian restart`
94	`service dnsmasq restart`	94	`service dnsmasq restart`
95	`/usr/local/bin/alcasar-iptables.sh`	95	`/usr/local/bin/alcasar-iptables.sh`
96	`fi`	96	`fi`
97	`}`	97	`}`
98	`function bl_disable (){`	98	`function bl_disable (){`
99	`rm -rf $DIR_DNS_FILTER_ENABLED/*`	99	`rm -rf $DIR_DNS_FILTER_ENABLED/*`
100	`$SED "s/^reportinglevel =.*/reportinglevel = -1/g" /etc/dansguardian/dansguardian.conf`	100	`$SED "s/^reportinglevel =.*/reportinglevel = -1/g" /etc/dansguardian/dansguardian.conf`
101	`$SED "s?^[^#]?#&?g" $DIR_DG/urlregexplist # Disable 'safesearch'`	101	`$SED "s?^[^#]?#&?g" $DIR_DG/urlregexplist # Disable 'safesearch'`
102	`if [ "$PARENT_SCRIPT" != "/usr/local/bin/alcasar-conf.sh" ] # don't launch on install stage`	102	`if [ "$PARENT_SCRIPT" != "/usr/local/bin/alcasar-conf.sh" ] # don't launch on install stage`
103	`then`	103	`then`
104	`service dansguardian restart`	104	`service dansguardian restart`
-		105	`service dnsmasq restart`
105	`/usr/local/bin/alcasar-iptables.sh`	106	`/usr/local/bin/alcasar-iptables.sh`
106	`fi`	107	`fi`
107	`}`	108	`}`
108	`usage="Usage: alcasar-bl.sh {-on or --on} \| { -off or --off } \| { -download or --download } \| { -reload or --reload } \| { -conf or --conf}"`	109	`usage="Usage: alcasar-bl.sh {-on or --on} \| { -off or --off } \| { -download or --download } \| { -reload or --reload }"`
109	`nb_args=$#`	110	`nb_args=$#`
110	`args=$1`	111	`args=$1`
111	`if [ $nb_args -eq 0 ]`	112	`if [ $nb_args -eq 0 ]`
112	`then`	113	`then`
-		114	DNS_FILTERING=`grep DNS_FILTERING $CONF_FILE\|cut -d"=" -f2` # DNS and URLs filter (on/off)
-		115	`DNS_FILTERING=${DNS_FILTERING:=off}`
-		116	`echo "Set BlackList Filtering to $DNS_FILTERING"`
-		117	`if [ $DNS_FILTERING = on ]; then`
-		118	`cat_choice`
113	`nb_args=1`	119	`bl_enable`
114	`args="-h"`	120	`else`
-		121	`bl_disable`
-		122	`fi`
-		123	`exit 0`
115	`fi`	124	`fi`
116	`case $args in`	125	`case $args in`
117	`-\? \| -h* \| --h*)`	126	`-\? \| -h* \| --h*)`
118	`echo "$usage"`	127	`echo "$usage"`
119	`exit 0`	128	`exit 0`
120	`;;`	129	`;;`
121	`# activation du filtrage`	130	`# activation du filtrage`
122	`-on \| --on)`	131	`-on \| --on)`
123	`cat_choice`	132	`cat_choice`
124	`$SED "s?^DNS_FILTERING.*?DNS_FILTERING=on?g" $CONF_FILE`	133	`$SED "s?^DNS_FILTERING.*?DNS_FILTERING=on?g" $CONF_FILE`
125	`bl_enable`	134	`bl_enable`
126	`;;`	135	`;;`
127	`# désactivation du filtrage`	136	`# désactivation du filtrage`
128	`-off \| --off)`	137	`-off \| --off)`
129	`$SED "s?^DNS_FILTERING.*?DNS_FILTERING=off?g" $CONF_FILE`	138	`$SED "s?^DNS_FILTERING.*?DNS_FILTERING=off?g" $CONF_FILE`
130	`bl_disable`	139	`bl_disable`
131	`;;`	140	`;;`
132	`-conf \| --conf)`	-
133	DNS_FILTERING=`grep DNS_FILTERING $CONF_FILE\|cut -d"=" -f2` # DNS and URLs filter (on/off)	-
134	`DNS_FILTERING=${DNS_FILTERING:=off}`	-
135	`if [ $DNS_FILTERING = on ]; then`	-
136	`cat_choice`	-
137	`bl_enable`	-
138	`else`	-
139	`bl_disable`	-
140	`fi`	-
141	`;;`	-
142	`# Mise a jour de la blacklist 'Toulouse' et adaptation à dansguardian et dnsmasq`	141	`# Mise a jour de la blacklist 'Toulouse' et adaptation à dansguardian et dnsmasq`
143	`-download \| --download)`	142	`-download \| --download)`
144	`rm -rf /tmp/con_ok.html`	143	`rm -rf /tmp/con_ok.html`
145	`/usr/bin/curl $BL_SERVER -# -o /tmp/con_ok.html`	144	`/usr/bin/curl $BL_SERVER -# -o /tmp/con_ok.html`
146	`if [ ! -e /tmp/con_ok.html ]`	145	`if [ ! -e /tmp/con_ok.html ]`
147	`then`	146	`then`
148	`echo "Erreur : le serveur de blacklist ($BL_SERVER) n'est pas joignable"`	147	`echo "Erreur : le serveur de blacklist ($BL_SERVER) n'est pas joignable"`
149	`else`	148	`else`
150	`transfert`	149	`transfert`
151	`install`	150	`install`
152	`chown -R dansguardian:apache $DIR_DG`	151	`chown -R dansguardian:apache $DIR_DG`
153	`chmod -R g+w $DIR_DG`	152	`chmod -R g+w $DIR_DG`
154	DATE=`date '+%d %B %Y - %Hh%M'`	153	DATE=`date '+%d %B %Y - %Hh%M'`
155	`echo "Univ-tlse du $DATE " > /var/www/html/VERSION-BL`	154	`echo "Univ-tlse du $DATE " > /var/www/html/VERSION-BL`
156	`rm -rf /tmp/con_ok.html`	155	`rm -rf /tmp/con_ok.html`
157	`fi`	156	`fi`
158	`adapt`	157	`adapt`
159	`;;`	158	`;;`
160	`# regénération suite à modification (choix catégories ou BL secondaire)`	159	`# regénération suite à modification (choix catégories ou BL secondaire)`
161	`-reload \| --reload)`	160	`-reload \| --reload)`
162	`adapt`	161	`adapt`
163	`# pour Dansguardian`	162	`# pour Dansguardian`
164	`chown -R dansguardian:apache $DIR_DG_BL/ossi`	163	`chown -R dansguardian:apache $DIR_DG_BL/ossi`
165	`chmod -R g+w $DIR_DG_BL/ossi`	164	`chmod -R g+w $DIR_DG_BL/ossi`
166	`cat_choice`	165	`cat_choice`
167	`service dansguardian restart`	-
168	`# pour dnsmasq (noms de domaine réhabilités)`	166	`# pour dnsmasq (noms de domaine réhabilités)`
169	if [ `wc -w $DIR_DG/exceptionsitelist\|cut -d " " -f1` != "0" ]	167	if [ `wc -w $DIR_DG/exceptionsitelist\|cut -d " " -f1` != "0" ]
170	`then`	168	`then`
171	for i in `cat $DIR_DG/exceptionsitelist`	169	for i in `cat $DIR_DG/exceptionsitelist`
172	`do`	170	`do`
173	`$SED "/$i/d" $DIR_DNS_FILTER_AVAILABLE/*`	171	`$SED "/$i/d" $DIR_DNS_FILTER_AVAILABLE/*`
174	`done`	172	`done`
175	`fi`	173	`fi`
176	`cp -f $DIR_DG_BL/ossi/domains $DIR_DNS_FILTER_AVAILABLE/ossi.conf`	174	`cp -f $DIR_DG_BL/ossi/domains $DIR_DNS_FILTER_AVAILABLE/ossi.conf`
177	`$SED "s?.*?address=/&/$IP_RETOUR?g" $DIR_DNS_FILTER_AVAILABLE/ossi.conf`	175	`$SED "s?.*?address=/&/$IP_RETOUR?g" $DIR_DNS_FILTER_AVAILABLE/ossi.conf`
-		176	DNS_FILTERING=`grep DNS_FILTERING $CONF_FILE\|cut -d"=" -f2` # DNS and URLs filter (on/off)
-		177	`DNS_FILTERING=${DNS_FILTERING:=off}`
-		178	`if [ $DNS_FILTERING = on ]; then`
-		179	`bl_enable`
-		180	`else`
178	`service dnsmasq restart`	181	`bl_disable`
-		182	`fi`
179	`;;`	183	`;;`
180	`*)`	184	`*)`
181	`echo "Argument inconnu :$1";`	185	`echo "Argument inconnu :$1";`
182	`echo "$usage"`	186	`echo "$usage"`
183	`exit 1`	187	`exit 1`
184	`;;`	188	`;;`
185	`esac`	189	`esac`
186		190
187		191

Subversion Repositories ALCASAR

(root)/scripts/alcasar-bl.sh @ 2665 – Rev 615 → 634