WebSVN – ALCASAR – Path Comparison – /

Ignore whitespace Rev 2828 → Rev 2829

 /alcasar.sh
 ,7 → 804,8
 # - base = users database
 # - archive = tarball of "base + http firewall + netflow"
 # - security = watchdog log
-        for i in base archive security activity_report;
+# - conf_file = archive conf file (usefull in updating process)
+        for i in base archive security activity_report conf_file;
         do
                 [ -d $DIR_SAVE/$i ] || mkdir -p $DIR_SAVE/$i
         done

 /scripts/alcasar-conf.sh
 ,6 → 100,8
                 cd /var/tmp || { echo "Unable to find /var/tmp directory"; }
                 tar -cf alcasar-conf.tar conf/
                 gzip -f alcasar-conf.tar
+                new="$(date +%G%m%d-%Hh%M)"                     # date & hour of files
+                cp alcasar-conf.tar.gz /var/SAVE/conf_file/alcasar-conf-$new.tar.gz
                 rm -rf $DIR_UPDATE
                 ;;

 /scripts/alcasar-mysql.sh
 ,14 → 8,14
 # Gestion (sauvegarde / import / RAZ) de la base MySQL 'radius'. Fermeture des sessions de comptabilité ouvertes
 # Management of mysql 'radius' database (save / import / RAZ). Close the accounting open sessions
-rep_tr="/var/Save/base"                         # répertoire d'accueil des sauvegardes
+rep_tr="/var/Save/base"
 DIR_BIN="/usr/local/bin"
 PASSWD_FILE="/root/ALCASAR-passwords.txt"
 DB_RADIUS="radius"
 DB_USER=$(grep '^db_user=' $PASSWD_FILE | cut -d'=' -f 2-)
 DB_PASS=$(grep '^db_password=' $PASSWD_FILE | cut -d'=' -f 2-)
-new="$(date +%G%m%d-%Hh%M)"                     # date et heure des fichiers
-fichier="alcasar-users-database-$new.sql"       # nom du fichier de sauvegarde
+new="$(date +%G%m%d-%Hh%M)"                     # date & hour of files
+fichier="alcasar-users-database-$new.sql"
 stop_acct ()

 /web/acc/backup/sauvegarde.php
 ,7 → 95,7
 $dir[0]="archive";
 $dir[1]="base";
 $dir[2]="activity_report";
-$dir[3]="system_backup";
+$dir[3]="conf_file";
 $j=0;
 $nb=count($dir);
 while ($j != $nb)