diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql index 2c0caf2914b9a17e8d1bd58dd3a8912636304116..2a8800363bb93d7a356a6c160c708b2fd44ed9ef 100644 --- a/install/sql/ispconfig3.sql +++ b/install/sql/ispconfig3.sql @@ -1084,6 +1084,8 @@ CREATE TABLE `web_domain` ( `allow_override` varchar(255) NOT NULL default 'All', `apache_directives` text, `php_open_basedir` text, + `backup_interval` VARCHAR( 255 ) NOT NULL DEFAULT 'none', + `backup_copies` INT NOT NULL DEFAULT '1', `active` enum('n','y') NOT NULL default 'y', `traffic_quota_lock` enum('n','y') NOT NULL default 'n', PRIMARY KEY (`domain_id`) diff --git a/install/tpl/server.ini.master b/install/tpl/server.ini.master index cfddc494fe0994940730958ee10af449c38a5150..d5584ba895b1d648102d63e284befc360f2a67e3 100644 --- a/install/tpl/server.ini.master +++ b/install/tpl/server.ini.master @@ -12,6 +12,7 @@ gateway=192.168.0.1 hostname=server1.domain.tld nameservers=192.168.0.1,192.168.0.2 loglevel=2 +backup_dir=/var/backup [mail] module=postfix_mysql diff --git a/interface/web/admin/form/server_config.tform.php b/interface/web/admin/form/server_config.tform.php index 5ebb88d0c375a5c7c1f4adcea0e678dacf2165b0..cf43c9a3515a4b10efc8617052b12fdceddb7fba 100644 --- a/interface/web/admin/form/server_config.tform.php +++ b/interface/web/admin/form/server_config.tform.php @@ -127,6 +127,17 @@ $form["tabs"]['server'] = array ( 'width' => '40', 'maxlength' => '255' ), + 'backup_dir' => array ( + 'datatype' => 'VARCHAR', + 'formtype' => 'TEXT', + 'default' => '/var/backup', + 'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY', + 'errmsg'=> 'backup_dir_error_empty'), + ), + 'value' => '', + 'width' => '40', + 'maxlength' => '255' + ), ################################## # ENDE Datatable fields ################################## diff --git a/interface/web/admin/lib/lang/en_server_config.lng b/interface/web/admin/lib/lang/en_server_config.lng index 761150a29e8f238e418bcd0fcbf40252e749e342..af703c4fde112b382415e16d1ab68a3962e4beae 100644 --- a/interface/web/admin/lib/lang/en_server_config.lng +++ b/interface/web/admin/lib/lang/en_server_config.lng @@ -69,4 +69,5 @@ $wb["awstats_conf_dir_txt"] = 'awstats conf folder'; $wb["awstats_data_dir_txt"] = 'awstats data folder'; $wb["awstats_pl_txt"] = 'awstats.pl script'; $wb["awstats_buildstaticpages_pl_txt"] = 'awstats_buildstaticpages.pl script'; +$wb["backup_dir_txt"] = 'Backup directory'; ?> \ No newline at end of file diff --git a/interface/web/admin/templates/server_config_server_edit.htm b/interface/web/admin/templates/server_config_server_edit.htm index 96204c7c102b90acc507b3b69319b26845dd57ed..bbe4a4ce66d368552e99b38b0601b23b4990afef 100644 --- a/interface/web/admin/templates/server_config_server_edit.htm +++ b/interface/web/admin/templates/server_config_server_edit.htm @@ -38,6 +38,10 @@ {tmpl_var name='loglevel'} +