Skip to content
Snippets Groups Projects
Commit ea5eee59 authored by Florian Schaal's avatar Florian Schaal
Browse files

backup: change mounts to backup_dir_mount_cmd

parent c4be523f
No related branches found
No related tags found
No related merge requests found
...@@ -74,10 +74,14 @@ class cronjob_backup extends cronjob { ...@@ -74,10 +74,14 @@ class cronjob_backup extends cronjob {
//* mount backup directory, if necessary //* mount backup directory, if necessary
$run_backups = true; $run_backups = true;
$server_config['backup_dir_mount_cmd'] = trim($server_config['backup_dir_mount_cmd']); $backup_dir_mount_cmd = '/usr/local/ispconfig/server/scripts/backup_dir_mount.sh';
if($server_config['backup_dir_is_mount'] == 'y' && $server_config['backup_dir_mount_cmd'] != ''){ if( $server_config['backup_dir_is_mount'] == 'y' &&
if(!$app->system->is_mounted($backup_dir)){ is_file($backup_dir_mount_cmd) &&
exec(escapeshellcmd($server_config['backup_dir_mount_cmd'])); is_executable($backup_dir_mount_cmd) &&
fileowner($backup_dir_mount_cmd) === 0
){
if(!$app->system->is_mounted($backup_dir)){
exec($backup_dir_mount_cmd);
sleep(1); sleep(1);
if(!$app->system->is_mounted($backup_dir)) $run_backups = false; if(!$app->system->is_mounted($backup_dir)) $run_backups = false;
} }
......
...@@ -61,10 +61,13 @@ class cronjob_backup_mail extends cronjob { ...@@ -61,10 +61,13 @@ class cronjob_backup_mail extends cronjob {
if($backup_dir != '') { if($backup_dir != '') {
//* mount backup directory, if necessary //* mount backup directory, if necessary
$run_backups = true; $run_backups = true;
$server_config['backup_dir_mount_cmd'] = trim($server_config['backup_dir_mount_cmd']); if( $server_config['backup_dir_is_mount'] == 'y' &&
if($server_config['backup_dir_is_mount'] == 'y' && $server_config['backup_dir_mount_cmd'] != ''){ is_file($backup_dir_mount_cmd) &&
is_executable($backup_dir_mount_cmd) &&
fileowner($backup_dir_mount_cmd) === 0
){
if(!$app->system->is_mounted($backup_dir)){ if(!$app->system->is_mounted($backup_dir)){
exec(escapeshellcmd($server_config['backup_dir_mount_cmd'])); exec($backup_dir_mount_cmd);
sleep(1); sleep(1);
if(!$app->system->is_mounted($backup_dir)) $run_backups = false; if(!$app->system->is_mounted($backup_dir)) $run_backups = false;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment