| /readme.txt |
|---|
| 6,8 → 6,8 |
| - New installation : Need the CD dual architecture (32b and 64b) of Linux Mageia2 (Mageia-2-dual-CD.iso). |
| --> Follow the installation documentation. |
| - Update an earlier version (see the §9.4 of the exploitation documentation) : |
| --> via the control center, create and retrieve the file "Alcacar-conf.tar.gz" |
| --> after the installation of the Linux system (mageia2), copy this file in the folder "/tmp" with the name "alcasar-conf.tar.gz" |
| --> via the control center of the running version, create and retrieve the system-backup (ie : "alcasar-conf-20130106-17h00.tar.gz") |
| --> after the installation of the new Linux system (mageia2), copy this file in the folder "/tmp" |
| --> download, extract and launch alcasar installation (like for a new installation) |
| *********** Français ******** |
| 15,7 → 15,7 |
| - Nouvelle installation : elle s'effectue sur la base CD double architectures (32b et 64b) de Linux Mageia2 (Mageia-2-dual-CD.iso). |
| --> Suivez la procédure d'installation. |
| - mise à jour d'une ancienne version (voir le §9.4 de la doc d'exploitation) : |
| --> à partir du centre de control, créez et récupérez le fichier "alcasar-conf.tar.gz" |
| --> après avoir installé le nouveau system (mageia2), copiez ce fichier dans le répertoire "/tmp" sous le nom "alcasar-conf.tar.gz" |
| --> à partir du centre de contrôle de la version actuelle, créez et récupérez l'archive système (ex : "alcasar-conf-20130106-17h00.tar.gz") |
| --> après avoir installé le nouveau système Linux (mageia2), copiez ce fichier dans le répertoire "/tmp" |
| --> récupérez, désarchivez et lancez l'installation d'ALCASAR (comme pour une nouvelle installation) |
| /alcasar.sh |
|---|
| 1750,7 → 1750,7 |
| $DIR_SCRIPTS/sbin/alcasar-uninstall.sh |
| fi |
| # Test if manual update |
| if [ -e /tmp/alcasar-conf.tar.gz ] && [ "$mode" != "update" ] |
| if [ -e /tmp/alcasar-conf*.tar.gz ] && [ "$mode" != "update" ] |
| then |
| header_install |
| if [ $Lang == "fr" ] |
| 1772,7 → 1772,7 |
| done |
| fi |
| # Test if update |
| if [ -e /tmp/alcasar-conf.tar.gz ] |
| if [ -e /tmp/alcasar-conf* ] |
| then |
| if [ $Lang == "fr" ] |
| then echo "#### Installation avec mise à jour ####"; |
| 1779,7 → 1779,7 |
| else echo "#### Installation with update ####"; |
| fi |
| # Extract the central configuration file |
| tar -xf /tmp/alcasar-conf.tar.gz conf/etc/alcasar.conf |
| tar -xf /tmp/alcasar-conf* conf/etc/alcasar.conf |
| ORGANISME=`grep ORGANISM conf/etc/alcasar.conf|cut -d"=" -f2` |
| PREVIOUS_VERSION=`grep VERSION conf/etc/alcasar.conf|cut -d"=" -f2` |
| MAJ_PREVIOUS_VERSION=`echo $PREVIOUS_VERSION|cut -d"." -f1` |
| /CHANGELOG |
|---|
| 3,6 → 3,7 |
| ************ CHANGELOG *********** |
| ---------------------- 2.7 ----------------- |
| BUGs - some corrections in the connection popup |
| - test if categories enabled of the BL are effectively in the BL (need after an update of the BL) |
| NEWS |
| - Installation with Mageia2 |
| - The URL filter works with the new google safesearch regex ('safe=strict' instead of 'safe=vss') |
| /scripts/sbin/alcasar-bl.sh |
|---|
| 44,7 → 44,7 |
| do |
| $SED "/\/$ENABLE_CATEGORIE$/d" $BL_CATEGORIES |
| $SED "1i\/etc\/dansguardian\/lists\/blacklists\/$ENABLE_CATEGORIE" $BL_CATEGORIES |
| ln -s $DIR_DNS_BL/$ENABLE_CATEGORIE $DIR_DNS_BL_ENABLED/$ENABLE_CATEGORIE |
| ln -s $DIR_DNS_BL/$ENABLE_CATEGORIE.conf $DIR_DNS_BL_ENABLED/$ENABLE_CATEGORIE |
| ln -s $DIR_IP_BL/$ENABLE_CATEGORIE $DIR_IP_BL_ENABLED/$ENABLE_CATEGORIE |
| echo ".Include<$DIR_DG_BL/$ENABLE_CATEGORIE/domains>" >> $DIR_DG/bannedsitelist # we let DG filters domain in order to prevent bypass by proxy http vpn ;-) |
| echo ".Include<$DIR_DG_BL/$ENABLE_CATEGORIE/urls>" >> $DIR_DG/bannedurllist |
| 160,6 → 160,15 |
| fi |
| done |
| rm -f $FILE_tmp |
| # Verify that the enabled categories are effectively in the BL (need after an update of the BL) |
| for ENABLE_CATEGORIE in `cat $BL_CATEGORIES_ENABLED` |
| do |
| ok=`grep /$ENABLE_CATEGORIE$ $BL_CATEGORIES|wc -l` |
| if [ $ok != "1" ] |
| then |
| $SED "/^$ENABLE_CATEGORIE$/d" $BL_CATEGORIES_ENABLED |
| fi |
| done |
| # Creation of DNSMASQ BL and WL |
| for LIST in $BL_CATEGORIES $WL_CATEGORIES # for each list (bl and wl) |
| do |
| /scripts/alcasar-conf.sh |
|---|
| 233,7 → 233,7 |
| ;; |
| --load|-load) |
| cd /tmp |
| tar -xf /tmp/alcasar-conf.tar.gz |
| tar -xf /tmp/alcasar-conf*.tar.gz |
| # récupération du fichier général de dnsmasq en attendant sa correction du bug pour les DNS externes |
| [ -e $DIR_UPDATE/dnsmasq ] && cp -f $DIR_UPDATE/dnsmasq /etc/sysconfig/dnsmasq \ |
| && chown root.root /etc/sysconfig/dnsmasq \ |