Subversion Repositories ALCASAR

Rev

Rev 1857 | Rev 1867 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log

Rev 1857 Rev 1864
Line 1... Line 1...
1 
#/bin/bash
 1 
#/bin/bash
2 
 
 2 
 
3 
# $Id: alcasar-bl.sh 1857 2016-05-02 13:11:06Z raphael.pion $
 3 
# $Id: alcasar-bl.sh 1864 2016-05-03 12:45:00Z 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 42... Line 42...
42 
function cat_choice (){
 42 
function cat_choice (){
43 
	# saving ossi category
 43 
	# saving ossi category
44 
	mkdir $DIR_tmp
 44 
	mkdir $DIR_tmp
45 
	cp $DIR_IP_BL/ossi $DIR_tmp
 45 
	cp $DIR_IP_BL/ossi $DIR_tmp
46 
 
 46 
 
47 
 
 47 
	#ip BL ENABLE
48 
	if [ -d $DIR_IP_BL_ENABLED ]
 48 
	if [ -d $DIR_IP_BL_ENABLED ]
49 
	then
 49 
	then
50 
		for file in `ls -1 $DIR_IP_BL_ENABLED | grep -v "^ossi-*"`
 50 
		for file in `ls -1 $DIR_IP_BL_ENABLED | grep -v "^ossi-*"`
51 
		do
 51 
		do
52 
			rm -f $DIR_IP_BL_ENABLED/$file
 52 
			rm -f $DIR_IP_BL_ENABLED/$file
Line 54... Line 54...
54 
	else
 54 
	else
55 
		mkdir $DIR_IP_BL_ENABLED
 55 
		mkdir $DIR_IP_BL_ENABLED
56 
		chown apache $DIR_IP_BL_ENABLED
 56 
		chown apache $DIR_IP_BL_ENABLED
57 
	fi
 57 
	fi
58
58
- 
 
 59
- 
 
 60 
	#dns BL ENABLED
- 
 
 61 
	if [ -d $DIR_DNS_BL_ENABLED ]
- 
 
 62 
	then
- 
 
 63 
		for file in `ls -1 $DIR_DNS_BL_ENABLED | grep -v "^ossi-*"`
- 
 
 64 
		do
- 
 
 65 
			rm -f $DIR_DNS_BL_ENABLED/$file
- 
 
 66 
		done
- 
 
 67 
	else
- 
 
 68 
		mkdir $DIR_DNS_BL_ENABLED
- 
 
 69 
		chown apache $DIR_DNS_BL_ENABLED
- 
 
 70 
	fi
- 
 
 71
- 
 
 72
- 
 
 73 
	#ip WL ENABLE
59 
	if [ -d $DIR_IP_WL_ENABLED ]
 74 
	if [ -d $DIR_IP_WL_ENABLED ]
60 
	then
 75 
	then
61 
		for file in `ls -1 $DIR_IP_WL_ENABLED | grep -v "^ossi-*"`
 76 
		for file in `ls -1 $DIR_IP_WL_ENABLED | grep -v "^ossi*"`
62 
		do
 77 
		do
63 
			rm -f $DIR_IP_WL_ENABLED/$file
 78 
			rm -f $DIR_IP_WL_ENABLED/$file
64 
		done
 79 
		done
65 
	else
 80 
	else
66 
		mkdir $DIR_IP_WL_ENABLED
 81 
		mkdir $DIR_IP_WL_ENABLED
67 
		chown apache $DIR_IP_WL_ENABLED
 82 
		chown apache $DIR_IP_WL_ENABLED
68 
	fi
 - 
 
69 
 
 - 
 
70 
 
 - 
 
71 
 
 - 
 
72 
	if [ ! -e $DIR_IP_WL_ENABLED/ossi ]
 - 
 
73 
	then
 - 
 
74 
		touch $DIR_IP_WL_ENABLED/ossi
83 
		touch $DIR_IP_WL_ENABLED/ossi
75 
		chown apache $DIR_IP_WL_ENABLED/ossi
 84 
		chown apache $DIR_IP_WL_ENABLED/ossi
76 
	fi
 85 
	fi
77 
 
 86 
 
78 
	if [ ! -e $DIR_DNS_WL/ossi.conf ]
 - 
 
79 
	then
 - 
 
80 
		touch $DIR_DNS_WL/ossi.conf
 - 
 
81 
		chown apache $DIR_DNS_WL/ossi.conf
 - 
 
82 
		ln -s $DIR_DNS_WL/ossi.conf $DIR_DNS_WL_ENABLED/ossi
 - 
 
83 
	fi
 - 
 
84 
 
 - 
 
85 
	if [ -d $DIR_DNS_BL_ENABLED ]
 - 
 
86 
	then
 - 
 
87 
		for file in `ls -1 $DIR_DNS_BL_ENABLED | grep -v "^ossi-*"`
 - 
 
88 
		do
 - 
 
89 
			rm -f $DIR_DNS_BL_ENABLED/$file
 - 
 
90 
		done
 - 
 
91 
	else
 - 
 
92 
		mkdir $DIR_DNS_BL_ENABLED
 87 
	#dns WL ENABLED
93 
		chown apache $DIR_DNS_BL_ENABLED
 - 
 
94 
	fi
 - 
 
95 
	if [ -d $DIR_DNS_WL_ENABLED ]
 88 
	if [ -d $DIR_DNS_WL_ENABLED ]
96 
	then
 89 
	then
97 
		for file in `ls -1 $DIR_DNS_WL_ENABLED | grep -v "^ossi-*"`
 90 
		for file in `ls -1 $DIR_DNS_WL_ENABLED | grep -v "^ossi-*"`
98 
		do
 91 
		do
99 
			rm -f $DIR_DNS_WL_ENABLED/$file
 92 
			rm -f $DIR_DNS_WL_ENABLED/$file
100 
		done
 93 
		done
101 
	else
 94 
	else
102 
		mkdir $DIR_DNS_WL_ENABLED
 95 
		mkdir $DIR_DNS_WL_ENABLED
103 
		chown apache $DIR_DNS_WL_ENABLED
 96 
		chown apache $DIR_DNS_WL_ENABLED
104 
	fi
 97 
	fi
- 
 
 98
- 
 
 99 
	#dns WL ossi.conf
- 
 
 100 
	if [ ! -e $DIR_DNS_WL/ossi.conf ]
- 
 
 101 
	then
- 
 
 102 
		touch $DIR_DNS_WL/ossi.conf
- 
 
 103 
		chown apache $DIR_DNS_WL/ossi.conf
- 
 
 104 
		ln -s $DIR_DNS_WL/ossi.conf $DIR_DNS_WL_ENABLED/ossi
- 
 
 105 
	fi
- 
 
 106 
 
- 
 
 107
- 
 
 108
105 
	$SED "/\.Include/d" $DIR_DG/bannedsitelist $DIR_DG/bannedurllist # cleaning for DG
 109 
	$SED "/\.Include/d" $DIR_DG/bannedsitelist $DIR_DG/bannedurllist # cleaning for DG
106 
	$SED "s?^[^#]?#&?g" $BL_CATEGORIES $WL_CATEGORIES # cleaning BL & WL categories file (comment all lines)
 110 
	$SED "s?^[^#]?#&?g" $BL_CATEGORIES $WL_CATEGORIES # cleaning BL & WL categories file (comment all lines)
107 
	# process the file $BL_CATEGORIES with the choice of categories
111 
	# process the file $BL_CATEGORIES with the choice of categories
108 
	for ENABLE_CATEGORIE in `cat $BL_CATEGORIES_ENABLED`
112 
	for ENABLE_CATEGORIE in `cat $BL_CATEGORIES_ENABLED`
109 
	do
 113 
	do
Line 165... Line 169...
165 
		cat_choice
 169 
		cat_choice
166 
		;;
 170 
		;;
167 
	# Adapt Toulouse BL to ALCASAR architecture (dnsmasq + DG + iptables)
 171 
	# Adapt Toulouse BL to ALCASAR architecture (dnsmasq + DG + iptables)
168 
	-adapt | --adapt)
 172 
	-adapt | --adapt)
169 
		echo -n "Toulouse BlackList migration process. Please wait : "
 173 
		echo -n "Toulouse BlackList migration process. Please wait : "
170 
		if [ ! -e $DIR_IP_WL_ENABLED/ossi ]
 - 
 
171 
		then
 174
172 
			touch $DIR_IP_WL_ENABLED/ossi
 - 
 
173 
			chown apache $DIR_IP_WL_ENABLED/ossi
 - 
 
174 
		fi
 175
175 
		if [ -f $DIR_tmp/blacklists.tar.gz ] # when downloading the last version of the BL
 176 
		if [ -f $DIR_tmp/blacklists.tar.gz ] # when downloading the last version of the BL
176 
		then
 177 
		then
177 
			[ -d $DIR_DG_BL/ossi ] && mv $DIR_DG_BL/ossi $DIR_tmp
 178 
			[ -d $DIR_DG_BL/ossi ] && mv $DIR_DG_BL/ossi $DIR_tmp
178 
			[ -e $DIR_IP_BL/ossi ] && mv $DIR_IP_BL/ossi $DIR_tmp/ossi-ip-bl
 179 
			[ -e $DIR_IP_BL/ossi ] && mv $DIR_IP_BL/ossi $DIR_tmp/ossi-ip-bl
179 
			rm -rf $DIR_DG_BL $DIR_IP_BL
 180 
			rm -rf $DIR_DG_BL $DIR_IP_BL