Subversion Repositories ALCASAR

Rev

Rev 1899 | Rev 1901 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log

Rev 1899 Rev 1900
Line 1... Line 1...
1 
#/bin/bash
 1 
#/bin/bash
2 
 
 2 
 
3 
# $Id: alcasar-bl.sh 1899 2016-05-19 08:58:02Z raphael.pion $
 3 
# $Id: alcasar-bl.sh 1900 2016-05-19 09:18:41Z raphael.pion $
4 
 
 4 
 
5 
# alcasar-bl.sh
 5 
# alcasar-bl.sh
6 
# by Franck BOUIJOUX and Richard REY
 6 
# by Franck BOUIJOUX and Richard REY
7 
# This script is distributed under the Gnu General Public License (GPL)
 7 
# This script is distributed under the Gnu General Public License (GPL)
8 
 
 8 
 
Line 196... Line 196...
196 
	# Adapt Toulouse University BL to ALCASAR architecture (dnsmasq + DG + iptables)
 196 
	# Adapt Toulouse University BL to ALCASAR architecture (dnsmasq + DG + iptables)
197 
	-adapt | --adapt)
 197 
	-adapt | --adapt)
198 
		echo -n "Adaptation process of Toulouse University blackList. Please wait : "
 198 
		echo -n "Adaptation process of Toulouse University blackList. Please wait : "
199
199
200 
		#to keep ossi files
 200 
		#to keep ossi files
- 
 
 201 
		if [ -d $DIR_IP_BL ]
- 
 
 202 
		then
201 
		mkdir $tmp_DIR_IP_BL $tmp_DIR_IP_WL $tmp_DIR_DNS_BL $tmp_DIR_DNS_WL
 203 
			mkdir $tmp_DIR_IP_BL $tmp_DIR_IP_WL $tmp_DIR_DNS_BL $tmp_DIR_DNS_WL
202 
		for x in $(ls -1 $DIR_IP_BL | grep "^ossi*")
 204 
			for x in $(ls -1 $DIR_IP_BL | grep "^ossi*")
203 
		do
 205 
			do
204 
			mv $DIR_IP_BL/$x $tmp_DIR_IP_BL
 206 
				mv $DIR_IP_BL/$x $tmp_DIR_IP_BL
205 
		done
 207 
			done
Line 213... Line 215...
213 
		done
 215 
			done
214 
		for x in $(ls -1 $DIR_DNS_WL | grep "^ossi*")
 216 
			for x in $(ls -1 $DIR_DNS_WL | grep "^ossi*")
215 
		do
 217 
			do
216 
			mv $DIR_DNS_WL/$x $tmp_DIR_DNS_WL
 218 
				mv $DIR_DNS_WL/$x $tmp_DIR_DNS_WL
217 
		done
 219 
			done
218
220 
		fi
219
221
220 
		if [ -f $DIR_tmp/blacklists.tar.gz ] # when downloading the last version of the BL
 222 
		if [ -f $DIR_tmp/blacklists.tar.gz ] # when downloading the last version of the BL
221 
		then
 223 
		then
222 
			[ -d $DIR_DG_BL/ossi ] && mv $DIR_DG_BL/ossi $DIR_tmp
 224 
			[ -d $DIR_DG_BL/ossi ] && mv $DIR_DG_BL/ossi $DIR_tmp
223 
			[ -e $DIR_IP_BL/ossi ] && mv $DIR_IP_BL/ossi $DIR_tmp/ossi-ip-bl
 225 
			[ -e $DIR_IP_BL/ossi ] && mv $DIR_IP_BL/ossi $DIR_tmp/ossi-ip-bl
Line 290... Line 292...
290 
		rm -f $FILE_tmp $FILE_ip_tmp
 292 
		rm -f $FILE_tmp $FILE_ip_tmp
291 
		# Restoring ossi file of BL IP
 293 
		# Restoring ossi file of BL IP
292 
		[ -e $DIR_tmp/ossi-ip-bl ] && mv $DIR_tmp/ossi-ip-bl $DIR_IP_BL/ossi
 294 
		[ -e $DIR_tmp/ossi-ip-bl ] && mv $DIR_tmp/ossi-ip-bl $DIR_IP_BL/ossi
293 
		rm -rf $DIR_tmp
 295 
		rm -rf $DIR_tmp
294
296
- 
 
 297 
		if [ -d $DIR_IP_BL ]
295
298 
		then
296 
		for x in $(ls -1 $tmp_DIR_IP_BL | grep "^ossi*")
 299 
			for x in $(ls -1 $tmp_DIR_IP_BL | grep "^ossi*")
297 
		do
 300 
			do
298 
			mv $tmp_DIR_IP_BL/$x $DIR_IP_BL
 301 
				mv $tmp_DIR_IP_BL/$x $DIR_IP_BL
299 
		done
 302 
			done
300 
		for x in $(ls -1 $tmp_DIR_IP_WL | grep "^ossi*")
 303 
			for x in $(ls -1 $tmp_DIR_IP_WL | grep "^ossi*")
Line 309... Line 312...
309 
		do
 312 
			do
310 
			mv $tmp_DIR_DNS_WL/$x $DIR_DNS_WL
 313 
				mv $tmp_DIR_DNS_WL/$x $DIR_DNS_WL
311 
		done
 314 
			done
312
315
313 
		rm -rf $tmp_DIR_IP_BL $tmp_DIR_IP_WL $tmp_DIR_DNS_BL $tmp_DIR_DNS_WL
 316 
			rm -rf $tmp_DIR_IP_BL $tmp_DIR_IP_WL $tmp_DIR_DNS_BL $tmp_DIR_DNS_WL
- 
 
 317 
		fi
- 
 
 318
314 
		echo
 319 
		echo
315 
		;;
 320 
		;;
316 
	# update the categories which are written in "/usr/local/etc/update_cat.conf" with rsync
 321 
	# update the categories which are written in "/usr/local/etc/update_cat.conf" with rsync
317 
	-update_cat | --update_cat)
 322 
	-update_cat | --update_cat)
318 
		if [ $(cat /usr/local/etc/update_cat.conf | wc -l) -ne 0 ]
 323 
		if [ $(cat /usr/local/etc/update_cat.conf | wc -l) -ne 0 ]