From 0b22b5eff8e4fa2b12c375539997c1ad6933561c Mon Sep 17 00:00:00 2001
From: Florian Schaal <florian@schaal-24.de>
Date: Tue, 04 Nov 2014 02:35:48 -0500
Subject: [PATCH] (re)add filesize to website-backups
---
server/plugins-available/backup_plugin.inc.php | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/server/plugins-available/backup_plugin.inc.php b/server/plugins-available/backup_plugin.inc.php
index e862d37..42c1d77 100644
--- a/server/plugins-available/backup_plugin.inc.php
+++ b/server/plugins-available/backup_plugin.inc.php
@@ -73,13 +73,27 @@
$backup_dir = $server_config['backup_dir'].'/web'.$web['domain_id'];
//* mount backup directory, if necessary
+ /*
$backup_dir_is_ready = true;
$server_config['backup_dir_mount_cmd'] = trim($server_config['backup_dir_mount_cmd']);
if($server_config['backup_dir_is_mount'] == 'y' && $server_config['backup_dir_mount_cmd'] != ''){
- if(!$app->system->is_mounted($backup_dir)){
+ if(!$app->system->is_mounted($server_config['backup_dir'])){
exec(escapeshellcmd($server_config['backup_dir_mount_cmd']));
sleep(1);
- if(!$app->system->is_mounted($backup_dir)) $backup_dir_is_ready = false;
+ if(!$app->system->is_mounted($server_config['backup_dir'])) $backup_dir_is_ready = false;
+ }
+ }*/
+ $backup_dir_is_ready = true;
+ $backup_dir_mount_cmd = '/usr/local/ispconfig/server/scripts/backup_dir_mount.sh';
+ if( $server_config['backup_dir_is_mount'] == 'y' &&
+ 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)){
+ exec($backup_dir_mount_cmd);
+ sleep(1);
+ if(!$app->system->is_mounted($server_config['backup_dir'])) $backup_dir_is_ready = false;
}
}
--
Gitblit v1.9.1