| 100,7 → 100,6 |
|---|
| fi |
| else |
| # si version >= 2.1 : sauvegarde des certificats (serveur et CA) |
| mkdir $DIR_UPDATE/pki/ |
| cert_date=`/usr/bin/openssl x509 -noout -in /etc/pki/tls/certs/alcasar.crt -dates|grep After|cut -d"=" -f2` |
| cp -f /etc/pki/tls/certs/alcasar.crt $DIR_UPDATE |
| cp -f /etc/pki/tls/private/alcasar.key $DIR_UPDATE |
| 180,7 → 179,7 |
|---|
| fi |
| fi |
| # since V2.6 |
| # macallowed is replaced with macauth since |
| # macallowed is replaced with macauth |
| rm -f $DIR_UPDATE/etc/alcasar-macallowed |
| # DHCP mode can be "off/half/full" |
| DHCP_mode=`cat $CONF_FILE|grep DHCP=|cut -d"=" -f2` |
| 187,14 → 186,14 |
|---|
| if [ $DHCP_mode = "on" ]; then |
| $SED "s?^DHCP=on.*?DHCP=full?" $CONF_FILE # DHCP option can be "off/half/full" since V2.6 |
| fi |
| # le paramêtre 'EXT_LAN_FILTERING' n'existe plus |
| # The option 'EXT_LAN_FILTERING' is deleted |
| $SED "/^EXT_LAN/d" $CONF_FILE |
| # la catégorie de sites filtrés "ip" n'existe plus |
| # The category "ip" no longer exist |
| $SED "/\/ip\/urls/d" $DIR_UPDATE/bannedurllist; $SED "/\/ip\/domains/d" $DIR_UPDATE/bannedsitelist |
| $SED "/blacklists\/ip/d" $DIR_UPDATE/etc/alcasar-bl-categories; $SED "/^ip/d" $DIR_UPDATE/etc/alcasar-bl-categories-enabled |
| # les bl et wl de dnsmasq sont reconstruites dynamiquement dans /usr/local/share |
| # BL and WL are now dynamically built in "/usr/local/share" |
| rm -rf $DIR_UPDATE/etc/alcasar-dnsfilter-enabled $DIR_UPDATE/etc/alcasar-dnsfilter-available |
| # bing et Youtube sont ajoutés au safesearching |
| # Bing et Youtube are addes to the safesearching system |
| Bing=`grep bing $DIR_UPDATE/urlregexplist | wc -l` |
| if [ $Bing -ne "1" ]; then |
| SafeSearch=`grep ^\"\(\^http\:\/\/ $DIR_UPDATE/urlregexplist | wc -l` |