From a8123880e1141ee7188a95994335656a64a8c707 Mon Sep 17 00:00:00 2001
From: Florian Schaal <florian@schaal-24.de>
Date: Wed, 8 Jan 2014 07:58:49 +0100
Subject: [PATCH] Allow the admin to configure the deleting of backups when a
web-site / mail-domain is deleted.
---
install/tpl/server.ini.master | 1 +
interface/web/admin/form/server_config.tform.php | 6 ++++++
interface/web/admin/lib/lang/en_server_config.lng | 1 +
interface/web/admin/templates/server_config_server_edit.htm | 6 ++++++
server/plugins-available/apache2_plugin.inc.php | 2 +-
server/plugins-available/mail_plugin.inc.php | 5 +++--
6 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/install/tpl/server.ini.master b/install/tpl/server.ini.master
index b31d604c0b..c5c5f4607c 100644
--- a/install/tpl/server.ini.master
+++ b/install/tpl/server.ini.master
@@ -19,6 +19,7 @@ backup_dir=/var/backup
backup_dir_is_mount=n
backup_dir_mount_cmd=
backup_mode=rootgz
+baclup_delete=n
monit_url=
monit_user=
monit_password=
diff --git a/interface/web/admin/form/server_config.tform.php b/interface/web/admin/form/server_config.tform.php
index cde19e44b4..dde1d746a9 100644
--- a/interface/web/admin/form/server_config.tform.php
+++ b/interface/web/admin/form/server_config.tform.php
@@ -195,6 +195,12 @@ $form["tabs"]['server'] = array(
'width' => '40',
'maxlength' => '255'
),
+ 'backup_delete' => array(
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'CHECKBOX',
+ 'default' => 'y',
+ 'value' => array(0 => 'n', 1 => 'y')
+ ),
'monit_url' => array(
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
diff --git a/interface/web/admin/lib/lang/en_server_config.lng b/interface/web/admin/lib/lang/en_server_config.lng
index 385ff9fd96..07e94af875 100644
--- a/interface/web/admin/lib/lang/en_server_config.lng
+++ b/interface/web/admin/lib/lang/en_server_config.lng
@@ -196,4 +196,5 @@ $wb["vhost_rewrite_v6_txt"] = 'Rewrite IPv6 on Mirror';
$wb["v6_prefix_length"] = 'Prefix too long according to defined IPv6 ';
$wb['backup_dir_is_mount_txt'] = 'Backup directory is a mount?';
$wb['backup_dir_mount_cmd_txt'] = 'Mount command, if backup directory not mounted';
+$wb['backup_delete_txt'] = 'Delete backups on domain/website delete';
?>
diff --git a/interface/web/admin/templates/server_config_server_edit.htm b/interface/web/admin/templates/server_config_server_edit.htm
index 7c0c7b7e4d..e52a543ce3 100644
--- a/interface/web/admin/templates/server_config_server_edit.htm
+++ b/interface/web/admin/templates/server_config_server_edit.htm
@@ -73,6 +73,12 @@
<select name="backup_mode" id="backup_mode" class="selectInput">
{tmpl_var name='backup_mode'}
</select>
+ </div>
+ <div class="ctrlHolder">
+ <p class="label">{tmpl_var name='backup_delete_txt'}</p>
+ <div class="multiField">
+ {tmpl_var name='backup_delete'}
+ </div>
</div>
<div class="ctrlHolder">
<label for="monit_url">{tmpl_var name='monit_url_txt'}</label>
diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php
index 499f23eb13..5fc085be74 100644
--- a/server/plugins-available/apache2_plugin.inc.php
+++ b/server/plugins-available/apache2_plugin.inc.php
@@ -1991,7 +1991,7 @@ class apache2_plugin {
//* mount backup directory, if necessary
$mount_backup = true;
$server_config['backup_dir_mount_cmd'] = trim($server_config['backup_dir_mount_cmd']);
- if($server_config['backup_dir'] != '') {
+ if($server_config['backup_dir'] != '' && $server_config['backup_delete'] == 'y') {
if($server_config['backup_dir_is_mount'] == 'y' && $server_config['backup_dir_mount_cmd'] != ''){
if(!$app->system->is_mounted($backup_dir)){
exec(escapeshellcmd($server_config['backup_dir_mount_cmd']));
diff --git a/server/plugins-available/mail_plugin.inc.php b/server/plugins-available/mail_plugin.inc.php
index 378c4aded8..4a308da615 100644
--- a/server/plugins-available/mail_plugin.inc.php
+++ b/server/plugins-available/mail_plugin.inc.php
@@ -326,13 +326,14 @@ class mail_plugin {
} else {
$app->log('Possible security violation when deleting the maildir: '.$data['old']['maildir'], LOGLEVEL_ERROR);
}
+
//* Delete the mail-backups
$server_config = $app->getconf->get_server_config($conf['server_id'], 'server');
$backup_dir = $server_config['backup_dir'];
//* mount backup directory, if necessary
$mount_backup = true;
$server_config['backup_dir_mount_cmd'] = trim($server_config['backup_dir_mount_cmd']);
- if($server_config['backup_dir'] != '' && $maildir_path_deleted) {
+ if($server_config['backup_dir'] != '' && $maildir_path_deleted && $server_config['backup_delete'] == 'y') {
if($server_config['backup_dir_is_mount'] == 'y' && $server_config['backup_dir_mount_cmd'] != ''){
if(!$app->system->is_mounted($backup_dir)){
exec(escapeshellcmd($server_config['backup_dir_mount_cmd']));
@@ -391,7 +392,7 @@ class mail_plugin {
//* mount backup directory, if necessary
$mount_backup = true;
$server_config['backup_dir_mount_cmd'] = trim($server_config['backup_dir_mount_cmd']);
- if($server_config['backup_dir'] != '' && $maildomain_path_deleted) {
+ if($server_config['backup_dir'] != '' && $maildomain_path_deleted && $server_config['backup_delete'] == 'y'){
if($server_config['backup_dir_is_mount'] == 'y' && $server_config['backup_dir_mount_cmd'] != ''){
if(!$app->system->is_mounted($backup_dir)){
exec(escapeshellcmd($server_config['backup_dir_mount_cmd']));
--
GitLab