From 5a4e333fbc7c312de5b3e0e0637350abf34dfbb3 Mon Sep 17 00:00:00 2001 From: Oussama Date: Thu, 21 Dec 2017 13:08:34 +0100 Subject: [PATCH 1/3] Update 500-backup.inc.php --- server/lib/classes/cron.d/500-backup.inc.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/server/lib/classes/cron.d/500-backup.inc.php b/server/lib/classes/cron.d/500-backup.inc.php index 5dcb2d5fc3..e512d86b17 100644 --- a/server/lib/classes/cron.d/500-backup.inc.php +++ b/server/lib/classes/cron.d/500-backup.inc.php @@ -238,11 +238,11 @@ class cronjob_backup extends cronjob { $db_name = $rec['database_name']; $db_backup_file = 'db_'.$db_name.'_'.date('Y-m-d_H-i').'.sql'; //$command = "mysqldump -h '".escapeshellcmd($clientdb_host)."' -u '".escapeshellcmd($clientdb_user)."' -p'".escapeshellcmd($clientdb_password)."' -c --add-drop-table --create-options --quick --result-file='".$db_backup_dir.'/'.$db_backup_file."' '".$db_name."'"; - $command = "mysqldump -h ".escapeshellarg($clientdb_host)." -u ".escapeshellarg($clientdb_user)." -p".escapeshellarg($clientdb_password)." -c --add-drop-table --create-options --quick --max_allowed_packet=512M --result-file='".$db_backup_dir.'/'.$db_backup_file."' '".$db_name."'"; + $command = "mysqldump -h ".escapeshellarg($clientdb_host)." -u ".escapeshellarg($clientdb_user)." -p".escapeshellarg($clientdb_password)." -c --add-drop-table --create-options --quick --max_allowed_packet=512M --result-file='/tmp/".$db_backup_file."' '".$db_name."'"; exec($command, $tmp_output, $retval); //* Compress the backup with gzip - if($retval == 0) exec("gzip -c '".escapeshellcmd($db_backup_dir.'/'.$db_backup_file)."' > '".escapeshellcmd($db_backup_dir.'/'.$db_backup_file).".gz'", $tmp_output, $retval); + if($retval == 0) exec("gzip -c '".escapeshellcmd('/tmp/'.$db_backup_file)."' > '".escapeshellcmd($db_backup_dir.'/'.$db_backup_file).".gz'", $tmp_output, $retval); if($retval == 0){ if(is_file($db_backup_dir.'/'.$db_backup_file.'.gz')){ @@ -262,7 +262,7 @@ class cronjob_backup extends cronjob { if(is_file($db_backup_dir.'/'.$db_backup_file.'.gz')) unlink($db_backup_dir.'/'.$db_backup_file.'.gz'); } //* Remove the uncompressed file - if(is_file($db_backup_dir.'/'.$db_backup_file)) unlink($db_backup_dir.'/'.$db_backup_file); + if(is_file('/tmp/'.$db_backup_file)) unlink('/tmp/'.$db_backup_file); //* Remove old backups $backup_copies = intval($rec['backup_copies']); -- GitLab From 40b5c064d984f78f7293cdb222b67f29703d6767 Mon Sep 17 00:00:00 2001 From: Djidel Date: Sat, 23 Dec 2017 10:05:22 +0100 Subject: [PATCH 2/3] Update 500-backup.inc.php --- server/lib/classes/cron.d/500-backup.inc.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/server/lib/classes/cron.d/500-backup.inc.php b/server/lib/classes/cron.d/500-backup.inc.php index e512d86b17..dc755af4c5 100644 --- a/server/lib/classes/cron.d/500-backup.inc.php +++ b/server/lib/classes/cron.d/500-backup.inc.php @@ -238,11 +238,11 @@ class cronjob_backup extends cronjob { $db_name = $rec['database_name']; $db_backup_file = 'db_'.$db_name.'_'.date('Y-m-d_H-i').'.sql'; //$command = "mysqldump -h '".escapeshellcmd($clientdb_host)."' -u '".escapeshellcmd($clientdb_user)."' -p'".escapeshellcmd($clientdb_password)."' -c --add-drop-table --create-options --quick --result-file='".$db_backup_dir.'/'.$db_backup_file."' '".$db_name."'"; - $command = "mysqldump -h ".escapeshellarg($clientdb_host)." -u ".escapeshellarg($clientdb_user)." -p".escapeshellarg($clientdb_password)." -c --add-drop-table --create-options --quick --max_allowed_packet=512M --result-file='/tmp/".$db_backup_file."' '".$db_name."'"; + $command = "mysqldump -h ".escapeshellarg($clientdb_host)." -u ".escapeshellarg($clientdb_user)." -p".escapeshellarg($clientdb_password)." -c --add-drop-table --create-options --quick --max_allowed_packet=512M --result-file='/var/backup/".$db_backup_file."' '".$db_name."'"; exec($command, $tmp_output, $retval); //* Compress the backup with gzip - if($retval == 0) exec("gzip -c '".escapeshellcmd('/tmp/'.$db_backup_file)."' > '".escapeshellcmd($db_backup_dir.'/'.$db_backup_file).".gz'", $tmp_output, $retval); + if($retval == 0) exec("gzip -c '".escapeshellcmd('/var/backup/'.$db_backup_file)."' > '".escapeshellcmd($db_backup_dir.'/'.$db_backup_file).".gz'", $tmp_output, $retval); if($retval == 0){ if(is_file($db_backup_dir.'/'.$db_backup_file.'.gz')){ @@ -262,7 +262,7 @@ class cronjob_backup extends cronjob { if(is_file($db_backup_dir.'/'.$db_backup_file.'.gz')) unlink($db_backup_dir.'/'.$db_backup_file.'.gz'); } //* Remove the uncompressed file - if(is_file('/tmp/'.$db_backup_file)) unlink('/tmp/'.$db_backup_file); + if(is_file('/var/backup/'.$db_backup_file)) unlink('/var/backup/'.$db_backup_file); //* Remove old backups $backup_copies = intval($rec['backup_copies']); -- GitLab From 5efb7c49ec80f2832afdb08f3a0572514c09b6c7 Mon Sep 17 00:00:00 2001 From: Djidel Date: Sat, 23 Dec 2017 10:10:42 +0100 Subject: [PATCH 3/3] Update 500-backup.inc.php -- GitLab