WebSVN – ALCASAR – Path Comparison – / – /scripts/sbin/ Rev 884 and /scripts/sbin/ Rev 885

Ignore whitespace Rev 884 → Rev 885

 /scripts/sbin/alcasar-url_filter.sh
 ,6 → 10,7
 # Enable / disable : filter of urls containing ip address instead of domain name
 DIR_DG="/etc/dansguardian/lists"
+CONF_FILE="/usr/local/etc/alcasar.conf"
 SED="/bin/sed -i"
 safesearch="Off"
 pureip="Off"
 ,7 → 55,9
         done
         if [ $safesearch == "On" ]
         then
-                $SED "s?^#\"?\"?g" $DIR_DG/urlregexplist
+                $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
         else
                 $SED "s?^[^#]?#&?g" $DIR_DG/urlregexplist
         fi
 ,6 → 68,6
                 $SED "s/^\*ip$/#*ip/g" $DIR_DG/bannedsitelist
         fi
-#service dansguardian restart
+service dansguardian restart
 fi

 /scripts/sbin/alcasar-bl.sh
 ,10 → 104,9
                 else
                         rm -rf /tmp/con_ok.html $DIR_tmp
                         mkdir $DIR_tmp
-                        cd $DIR_tmp
-                        wget http://$BL_SERVER/blacklists/download/blacklists.tar.gz
+                        wget -P $DIR_tmp http://$BL_SERVER/blacklists/download/blacklists.tar.gz
                         md5sum $DIR_tmp/blacklists.tar.gz | cut -d" " -f1 > $DIR_tmp/md5sum
-                        cd /root
+                        chown -R apache:apache $DIR_tmp
                 fi
                 ;;
         # Adaptation de la BL de Toulouse à notre structure (dnsmasq + DG)