Subversion Repositories ALCASAR

Compare Revisions

Ignore whitespace Rev 2834 → Rev 2835

/alcasar.sh
2380,14 → 2380,14
echo "*** 'debug' : end of cleaning ***"
read
fi
# Test if manual update
if [ -e /var/tmp/alcasar-conf.tar.gz ] && [ "$mode" == "install" ]
# Test if conf file
if [ -e /var/tmp/alcasar-conf.tar.gz ]
then
# Extract some info from the previous configuration file
cd /var/tmp
tar -xf /var/tmp/alcasar-conf.tar.gz conf/etc/alcasar.conf
cd $DIR_INSTALL
if [ "mode" == "install" ]
if [ "mode" == "install" ] # don't display this if updating a running version
then
header_install
ORGANISME=`grep ^ORGANISM= conf/etc/alcasar.conf|cut -d"=" -f2`
/scripts/alcasar-conf.sh
100,8 → 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
cp alcasar-conf.tar.gz /var/www/html/acc/backup/alcasar-conf.tar.gz
chown apache:apache /var/www/html/acc/backup/alcasar-conf.tar.gz
rm -rf $DIR_UPDATE
;;
 
/web/acc/backup/sauvegarde.php
22,7 → 22,6
$l_firewall_log = "Journaux de traçabilité";
$l_users_db_backups = "Base des usagers";
$l_weekly_report = "Rapports d'activité hebdomadaire";
$l_system_backup = "Fichiers de configuration";
$l_empty = "vide";
}
else {
35,7 → 34,6
$l_firewall_log = "Traceability log files";
$l_users_db_backups = "Users database";
$l_weekly_report = "Weekly activity reports";
$l_system_backup = "Configuration files";
$l_empty = "empty";
}
function taille_fichier($fichier)
75,7 → 73,6
<td><b><?= $l_firewall_log?></b></td>
<td><b><?= $l_users_db_backups?></b></td>
<td><b><?= $l_weekly_report?></b></td>
<TD><b><?= $l_system_backup?></b></TD>
</tr>
<tr align="center">
<?
89,6 → 86,7
break;
case 'system_backup' :
exec ("sudo /usr/local/bin/alcasar-conf.sh --create");
header('Location: alcasar-conf.tar.gz');
break;
}
}
95,7 → 93,6
$dir[0]="archive";
$dir[1]="base";
$dir[2]="activity_report";
$dir[3]="conf_file";
$j=0;
$nb=count($dir);
while ($j != $nb)