| Line 58... |
Line 58... |
| 58 |
then
|
58 |
then
|
| 59 |
$SED "s?^#\"?\"?g" $DIR_DG/urlregexplist # on décommente les lignes de regles
|
59 |
$SED "s?^#\"?\"?g" $DIR_DG/urlregexplist # on décommente les lignes de regles
|
| 60 |
youtube_id=`grep YOUTUBE_ID $CONF_FILE|cut -d"=" -f2`
|
60 |
youtube_id=`grep YOUTUBE_ID $CONF_FILE|cut -d"=" -f2`
|
| 61 |
$SED "s?\&edufilter=.*?\&edufilter=$youtube_id\"?g" $DIR_DG/urlregexplist
|
61 |
$SED "s?\&edufilter=.*?\&edufilter=$youtube_id\"?g" $DIR_DG/urlregexplist
|
| 62 |
# add 'nosslsearch' redirection for google searching
|
62 |
# add 'nosslsearch' redirection for google searching
|
| - |
|
63 |
# $SED "/google/d" $DNSMASQ_BL_CONF # remove old google declaration
|
| - |
|
64 |
# nossl_server=`host -ta nosslsearch.google.com|cut -d" " -f4` # retrieve google nosslsearch ip
|
| - |
|
65 |
# echo "# nosslsearch redirect server for google" >> $DNSMASQ_BL_CONF
|
| - |
|
66 |
# for gg_dnsname in .google.com .google.ad .google.ae .google.com.af .google.com.ag .google.com.ai .google.al .google.am .google.co.ao .google.com.ar .google.as .google.at .google.com.au .google.az .google.ba .google.com.bd .google.be .google.bf .google.bg .google.com.bh .google.bi .google.bj .google.com.bn .google.com.bo .google.com.br .google.bs .google.bt .google.co.bw .google.by .google.com.bz .google.ca .google.cd .google.cf .google.cg .google.ch .google.ci .google.co.ck .google.cl .google.cm .google.cn .google.com.co .google.co.cr .google.com.cu .google.cv .google.com.cy .google.cz .google.de .google.dj .google.dk .google.dm .google.com.do .google.dz .google.com.ec .google.ee .google.com.eg .google.es .google.com.et .google.fi .google.com.fj .google.fm .google.fr .google.ga .google.ge .google.gg .google.com.gh .google.com.gi .google.gl .google.gm .google.gp .google.gr .google.com.gt .google.gy .google.com.hk .google.hn .google.hr .google.ht .google.hu .google.co.id .google.ie .google.co.il .google.im .google.co.in .google.iq .google.is .google.it .google.je .google.com.jm .google.jo .google.co.jp .google.co.ke .google.com.kh .google.ki .google.kg .google.co.kr .google.com.kw .google.kz .google.la .google.com.lb .google.li .google.lk .google.co.ls .google.lt .google.lu .google.lv .google.com.ly .google.co.ma .google.md .google.me .google.mg .google.mk .google.ml .google.com.mm .google.mn .google.ms .google.com.mt .google.mu .google.mv .google.mw .google.com.mx .google.com.my .google.co.mz .google.com.na .google.com.nf .google.com.ng .google.com.ni .google.ne .google.nl .google.no .google.com.np .google.nr .google.nu .google.co.nz .google.com.om .google.com.pa .google.com.pe .google.com.pg .google.com.ph .google.com.pk .google.pl .google.pn .google.com.pr .google.ps .google.pt .google.com.py .google.com.qa .google.ro .google.ru .google.rw .google.com.sa .google.com.sb .google.sc .google.se .google.com.sg .google.sh .google.si .google.sk .google.com.sl .google.sn .google.so .google.sm .google.sr .google.st .google.com.sv .google.td .google.tg .google.co.th .google.com.tj .google.tk .google.tl .google.tm .google.tn .google.to .google.com.tr .google.tt .google.com.tw .google.co.tz .google.com.ua .google.co.ug .google.co.uk .google.com.uy .google.co.uz .google.com.vc .google.co.ve .google.vg .google.co.vi .google.com.vn .google.vu .google.ws .google.rs .google.co.za .google.co.zm .google.co.zw .google.cat
|
| - |
|
67 |
# do
|
| - |
|
68 |
# echo "address=/$gg_dnsname/$nossl_server" >> $DNSMASQ_BL_CONF
|
| - |
|
69 |
# done
|
| - |
|
70 |
# add 'SafeSearch' redirection for google searching
|
| 63 |
$SED "/google/d" $DNSMASQ_BL_CONF # remove old google declaration
|
71 |
$SED "/google/d" $DNSMASQ_BL_CONF # remove old google declaration
|
| 64 |
nossl_server=`host -ta nosslsearch.google.com|cut -d" " -f4` # retrieve google nosslsearch ip
|
72 |
forcesafesearch_server=`host -ta forcesafesearch.google.com|cut -d" " -f4` # retrieve google forcesafesearch ip
|
| 65 |
echo "# nosslsearch redirect server for google" >> $DNSMASQ_BL_CONF
|
73 |
echo "# SafeSearch redirect server for google" >> $DNSMASQ_BL_CONF
|
| 66 |
echo "address=/www.google.com/$nossl_server" >> $DNSMASQ_BL_CONF
|
74 |
for gg_dnsname in .google.com .google.ad .google.ae .google.com.af .google.com.ag .google.com.ai .google.al .google.am .google.co.ao .google.com.ar .google.as .google.at .google.com.au .google.az .google.ba .google.com.bd .google.be .google.bf .google.bg .google.com.bh .google.bi .google.bj .google.com.bn .google.com.bo .google.com.br .google.bs .google.bt .google.co.bw .google.by .google.com.bz .google.ca .google.cd .google.cf .google.cg .google.ch .google.ci .google.co.ck .google.cl .google.cm .google.cn .google.com.co .google.co.cr .google.com.cu .google.cv .google.com.cy .google.cz .google.de .google.dj .google.dk .google.dm .google.com.do .google.dz .google.com.ec .google.ee .google.com.eg .google.es .google.com.et .google.fi .google.com.fj .google.fm .google.fr .google.ga .google.ge .google.gg .google.com.gh .google.com.gi .google.gl .google.gm .google.gp .google.gr .google.com.gt .google.gy .google.com.hk .google.hn .google.hr .google.ht .google.hu .google.co.id .google.ie .google.co.il .google.im .google.co.in .google.iq .google.is .google.it .google.je .google.com.jm .google.jo .google.co.jp .google.co.ke .google.com.kh .google.ki .google.kg .google.co.kr .google.com.kw .google.kz .google.la .google.com.lb .google.li .google.lk .google.co.ls .google.lt .google.lu .google.lv .google.com.ly .google.co.ma .google.md .google.me .google.mg .google.mk .google.ml .google.com.mm .google.mn .google.ms .google.com.mt .google.mu .google.mv .google.mw .google.com.mx .google.com.my .google.co.mz .google.com.na .google.com.nf .google.com.ng .google.com.ni .google.ne .google.nl .google.no .google.com.np .google.nr .google.nu .google.co.nz .google.com.om .google.com.pa .google.com.pe .google.com.pg .google.com.ph .google.com.pk .google.pl .google.pn .google.com.pr .google.ps .google.pt .google.com.py .google.com.qa .google.ro .google.ru .google.rw .google.com.sa .google.com.sb .google.sc .google.se .google.com.sg .google.sh .google.si .google.sk .google.com.sl .google.sn .google.so .google.sm .google.sr .google.st .google.com.sv .google.td .google.tg .google.co.th .google.com.tj .google.tk .google.tl .google.tm .google.tn .google.to .google.com.tr .google.tt .google.com.tw .google.co.tz .google.com.ua .google.co.ug .google.co.uk .google.com.uy .google.co.uz .google.com.vc .google.co.ve .google.vg .google.co.vi .google.com.vn .google.vu .google.ws .google.rs .google.co.za .google.co.zm .google.co.zw .google.cat
|
| - |
|
75 |
do
|
| 67 |
echo "address=/www.google.fr/$nossl_server" >> $DNSMASQ_BL_CONF
|
76 |
echo "address=/$gg_dnsname/$forcesafesearch_server" >> $DNSMASQ_BL_CONF
|
| - |
|
77 |
done
|
| 68 |
else
|
78 |
else
|
| 69 |
$SED "s?^[^#]?#&?g" $DIR_DG/urlregexplist
|
79 |
$SED "s?^[^#]?#&?g" $DIR_DG/urlregexplist
|
| 70 |
$SED "/google/d" $DNSMASQ_BL_CONF
|
80 |
$SED "/google/d" $DNSMASQ_BL_CONF
|
| 71 |
fi
|
81 |
fi
|
| 72 |
if [ $pureip == "On" ]
|
82 |
if [ $pureip == "On" ]
|
| 73 |
then
|
83 |
then
|
| 74 |
$SED "s/^\#\*ip$/*ip/g" $DIR_DG/bannedsitelist
|
84 |
$SED "s/^\#\*ip$/*ip/g" $DIR_DG/bannedsitelist
|
| 75 |
else
|
85 |
else
|
| 76 |
$SED "s/^\*ip$/#*ip/g" $DIR_DG/bannedsitelist
|
86 |
$SED "s/^\*ip$/#*ip/g" $DIR_DG/bannedsitelist
|
| 77 |
fi
|
87 |
fi
|
| 78 |
service dansguardian restart
|
88 |
systemctl restart dansguardian
|
| 79 |
service dnsmasq restart
|
89 |
systemctl restart dnsmasq-blacklist
|
| 80 |
fi
|
90 |
fi
|
| 81 |
|
91 |
|