/CHANGELOG |
---|
7,6 → 7,7 |
NEWS |
- Installation with Mageia2 |
- The URL filter works with the new google safesearch regex ('safe=strict' instead of 'safe=vss') |
- The safesearch for google works now with https (redirect on 'nosslsearch' proxy) |
- The WhiteList architecture is enabled |
- All the documentation has been translated in english |
- The security certificate is now signed in sha256 |
/scripts/sbin/alcasar-bl.sh |
---|
30,6 → 30,7 |
DIR_DNS_BL_ENABLED="$DIR_SHARE/dnsmasq-bl-enabled" # symbolic link to the dnsmasq BL (only enabled categories) |
DIR_DNS_WL_ENABLED="$DIR_SHARE/dnsmasq-wl-enabled" # ' ' ' WL ' ' ' |
DIR_IP_BL_ENABLED="$DIR_SHARE/iptables-bl-enabled" # ' ' ip BL (only enabled categories) |
DNSMASQ_BL_CONF="/etc/dnsmasq-blackhole.conf" # conf file of dnsmasq-blackhole |
BL_SERVER="dsi.ut-capitole.fr" |
SED="/bin/sed -i" |
73,6 → 74,9 |
function bl_disable (){ |
rm -rf $DIR_DNS_BL_ENABLED/* |
$SED "s/^reportinglevel =.*/reportinglevel = -1/g" /etc/dansguardian/dansguardian.conf |
$SED "/google/d" $DNSMASQ_BL_CONF # remove nosslsearch server |
$SED "s?^[^#]?#&?g" $DIR_DG/urlregexplist # remove safe searching |
$SED "s/^\*ip$/#*ip/g" $DIR_DG/bannedsitelist # remove pureip browsing |
if [ "$PARENT_SCRIPT" != "alcasar-conf.sh" ] # don't launch on install stage |
then |
service dansguardian restart |
/scripts/sbin/alcasar-url_filter.sh |
---|
10,6 → 10,7 |
# Enable / disable : filter of urls containing ip address instead of domain name |
DIR_DG="/etc/dansguardian/lists" |
DNSMASQ_BL_CONF="/etc/dnsmasq-blackhole.conf" |
CONF_FILE="/usr/local/etc/alcasar.conf" |
SED="/bin/sed -i" |
safesearch="Off" |
55,11 → 56,18 |
done |
if [ $safesearch == "On" ] |
then |
$SED "s?^#\"?\"?g" $DIR_DG/urlregexplist #on décommente les lignes de regles |
$SED "s?^#\"?\"?g" $DIR_DG/urlregexplist # on décommente les lignes de regles |
youtube_id=`grep YOUTUBE_ID $CONF_FILE|cut -d"=" -f2` |
$SED "s?\&edufilter=.*?\&edufilter=$youtube_id\"?g" $DIR_DG/urlregexplist |
# add 'nosslsearch' redirection for google searching |
$SED "/google/d" $DNSMASQ_BL_CONF # remove old google declaration |
nossl_server=`host -ta nosslsearch.google.com|cut -d" " -f4` # retrieve google nosslsearch ip |
echo "# nosslsearch redirect server for google" >> $DNSMASQ_BL_CONF |
echo "address=/www.google.com/$nossl_server" >> $DNSMASQ_BL_CONF |
echo "address=/www.google.fr/$nossl_server" >> $DNSMASQ_BL_CONF |
else |
$SED "s?^[^#]?#&?g" $DIR_DG/urlregexplist |
$SED "/google/d" $DNSMASQ_BL_CONF |
fi |
if [ $pureip == "On" ] |
then |
67,7 → 75,7 |
else |
$SED "s/^\*ip$/#*ip/g" $DIR_DG/bannedsitelist |
fi |
service dansguardian restart |
service dnsmasq restart |
fi |