diff --git a/install/tpl/server.ini.master b/install/tpl/server.ini.master index 2f4d7db3a47265fef8a138bc5c5330fd0635199e..41cb03c4fff2238af5c0513de932a351f1dbf7f2 100644 --- a/install/tpl/server.ini.master +++ b/install/tpl/server.ini.master @@ -16,6 +16,7 @@ firewall=bastille loglevel=2 admin_notify_events=1 backup_dir=/var/backup +backup_tmp=/tmp backup_dir_is_mount=n backup_mode=rootgz backup_time=0:00 diff --git a/interface/web/admin/form/server_config.tform.php b/interface/web/admin/form/server_config.tform.php index 70aac48e0787e06835b32a6773012e1cf213ec16..93094629ac934d1259ce78a951cca93b10d3f266 100644 --- a/interface/web/admin/form/server_config.tform.php +++ b/interface/web/admin/form/server_config.tform.php @@ -183,6 +183,20 @@ $form["tabs"]['server'] = array( 'width' => '40', 'maxlength' => '255' ), + 'backup_tmp' => array( + 'datatype' => 'VARCHAR', + 'formtype' => 'TEXT', + 'default' => '/tmp/', + 'validators' => array( 0 => array('type' => 'NOTEMPTY', + 'errmsg' => 'tmpdir_path_error_empty'), + 1 => array ( 'type' => 'REGEX', + 'regex' => '/^\/[a-zA-Z0-9\.\-\_\/]{5,128}$/', + 'errmsg'=> 'tmpdir_path_error_regex'), + ), + 'value' => '', + 'width' => '40', + 'maxlength' => '255' + ), 'backup_dir_is_mount' => array( 'datatype' => 'VARCHAR', 'formtype' => 'CHECKBOX', diff --git a/interface/web/admin/lib/lang/de_server_config.lng b/interface/web/admin/lib/lang/de_server_config.lng index 2656243d6aa05abfabb2fb47ab88c0ba676a72f2..ee55d43bb8b238fd397fbb5e19aff4797b0b16d3 100644 --- a/interface/web/admin/lib/lang/de_server_config.lng +++ b/interface/web/admin/lib/lang/de_server_config.lng @@ -81,6 +81,7 @@ $wb['awstats_data_dir_txt'] = 'AWStats Datenverzeichnis'; $wb['awstats_pl_txt'] = 'AWStats awstats.pl Script'; $wb['awstats_buildstaticpages_pl_txt'] = 'AWStats awstats_buildstaticpages.pl Script'; $wb['backup_dir_txt'] = 'Backupverzeichnis'; +$wb['backup_tmp_txt'] = 'Backup tmp-Dir (zip)'; $wb['named_conf_local_path_txt'] = 'BIND named.conf.local Pfad'; $wb['php_ini_path_cgi_txt'] = 'CGI php.ini Pfad'; $wb['php_ini_path_apache_txt'] = 'Apache php.ini Pfad'; @@ -103,6 +104,8 @@ $wb['nginx_user_txt'] = 'Nginx Benutzer'; $wb['nginx_group_txt'] = 'Nginx Gruppe'; $wb['nginx_cgi_socket_txt'] = 'Nginx CGI Socket'; $wb['backup_dir_error_empty'] = 'Backup Verzeichnis ist leer.'; +$wb['tmpdir_path_error_empty'] = 'Tmp-Dir Pfad ist leer.'; +$wb['tmpdir_path_error_regex'] = 'Invalid Tmp-Dir Pfad.'; $wb['maildir_path_error_empty'] = 'Maildir Pfad ist leer.'; $wb['homedir_path_error_empty'] = 'Homedir Pfad ist leer.'; $wb['mailuser_uid_error_empty'] = 'Mail Benutzer UID ist leer.'; diff --git a/interface/web/admin/lib/lang/en_server_config.lng b/interface/web/admin/lib/lang/en_server_config.lng index 80849cb5a795f23962d6a1e90849fa656b9c4cd5..7f7e2c8f85e594fd676f5a11cd5215eb9634ef0f 100644 --- a/interface/web/admin/lib/lang/en_server_config.lng +++ b/interface/web/admin/lib/lang/en_server_config.lng @@ -90,6 +90,7 @@ $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'; +$wb["backup_tmp_txt"] = 'Backup tmp directory for zip'; $wb["named_conf_local_path_txt"] = 'BIND named.conf.local path'; $wb["php_ini_path_cgi_txt"] = 'CGI php.ini path'; $wb["php_ini_path_apache_txt"] = 'Apache php.ini path'; @@ -101,6 +102,8 @@ $wb["fastcgi_config_syntax_txt"] = 'FastCGI config syntax'; $wb["backup_mode_txt"] = 'Backup mode'; $wb["backup_mode_userzip"] = 'Backup web files owned by web user as zip'; $wb["backup_mode_rootgz"] = 'Backup all files in web directory as root user'; +$wb['tmpdir_path_error_empty'] = 'tmp-dir Path is empty.'; +$wb['tmpdir_path_error_regex'] = 'Invalid tmp-dir path.'; $wb["backup_time_txt"] = 'Backup time'; $wb["server_type_txt"] = 'Server Type'; $wb["nginx_vhost_conf_dir_txt"] = 'Nginx Vhost config dir'; diff --git a/interface/web/admin/templates/server_config_server_edit.htm b/interface/web/admin/templates/server_config_server_edit.htm index 7868e87568d91797de16192f7d2deb16cce45885..e034fa53b9236d00d7970e72dc8bd12e23d7578d 100644 --- a/interface/web/admin/templates/server_config_server_edit.htm +++ b/interface/web/admin/templates/server_config_server_edit.htm @@ -63,6 +63,10 @@ {tmpl_var name='backup_mode'} +
+ +
+