db.sql

@@ -62,6 +62,7 @@ CREATE TABLE `wizard_template` (
   `http_port` int(11) NOT NULL DEFAULT '80',
   `https_port` int(11) NOT NULL DEFAULT '443',
   `log_retention` int(11) NOT NULL DEFAULT '30',
+  `proxy_protocol` ENUM('n','y') NOT NULL DEFAULT 'n',
   `apache_directives` mediumtext,
   `nginx_directives` mediumtext,
   `php_fpm_use_socket` enum('n','y') NOT NULL DEFAULT 'n',
@@ -74,6 +75,13 @@ CREATE TABLE `wizard_template` (
   `pm_process_idle_timeout` int(11) unsigned NOT NULL DEFAULT '10',
   `pm_max_requests` int(11) unsigned NOT NULL DEFAULT '0',
   `custom_php_ini` mediumtext,
+  `backup_interval` varchar(255) NOT NULL DEFAULT 'none',
+  `backup_copies` int(11) NOT NULL DEFAULT 1,
+  `backup_format_web` varchar(255) NOT NULL DEFAULT 'default',
+  `backup_format_db` varchar(255) NOT NULL DEFAULT 'gzip',
+  `backup_encrypt` enum('n','y') NOT NULL DEFAULT 'n',
+  `backup_password` varchar(255) NOT NULL DEFAULT '',
+  `backup_excludes` mediumtext DEFAULT NULL,
   `database_charset` varchar(64) DEFAULT NULL,
   `database_remote_access` enum('n','y') NOT NULL DEFAULT 'n',
   `database_remote_ips` text,
@@ -88,5 +96,9 @@ CREATE TABLE `wizard_template` (
   `enablesmtp` enum('n','y') NOT NULL DEFAULT 'y',
   `enableimap` enum('n','y') NOT NULL DEFAULT 'y',
   `enablepop3` enum('n','y') NOT NULL DEFAULT 'y',
+  `server_php_id` int(11) unsigned NOT NULL DEFAULT '0',
+  `jailkit_chroot_app_sections` mediumtext DEFAULT NULL,
+  `jailkit_chroot_app_programs` mediumtext DEFAULT NULL,
+  `delete_unused_jailkit` enum('n','y') NOT NULL DEFAULT 'n',
   PRIMARY KEY (`template_id`)
 ) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;

db_update_3.2.sql

+
+ALTER TABLE `wizard_template`
+    ADD COLUMN `proxy_protocol` ENUM('n','y') NOT NULL DEFAULT 'n' AFTER `log_retention`;
+ALTER TABLE `wizard_template`
+		ADD COLUMN `server_php_id` int(11) UNSIGNED NOT NULL DEFAULT 0;
+
+
+ALTER TABLE `wizard_template` ADD `backup_interval` varchar(255) NOT NULL DEFAULT 'none' AFTER `custom_php_ini`;
+ALTER TABLE `wizard_template` ADD `backup_copies` int(11) NOT NULL DEFAULT 1 AFTER `backup_interval`;
+
+-- backup format
+ALTER TABLE `wizard_template` ADD  `backup_format_web` VARCHAR( 255 ) NOT NULL default 'default' AFTER `backup_copies`;
+ALTER TABLE `wizard_template` ADD  `backup_format_db` VARCHAR( 255 ) NOT NULL default 'gzip' AFTER `backup_format_web`;
+-- end of backup format
+
+-- backup encryption
+ALTER TABLE `wizard_template` ADD  `backup_encrypt` enum('n','y') NOT NULL DEFAULT 'n' AFTER `backup_format_db`;
+ALTER TABLE `wizard_template` ADD  `backup_password` VARCHAR( 255 ) NOT NULL DEFAULT '' AFTER `backup_encrypt`;
+-- end of backup encryption
+
+ALTER TABLE `wizard_template` ADD `backup_excludes` mediumtext DEFAULT NULL AFTER `backup_password`;

form/new_service.tform.php

@@ -79,6 +79,9 @@ $form["auth_preset"]["perm_user"] = 'riud'; //r = read, i = insert, u = update,
 $form["auth_preset"]["perm_group"] = 'riud'; //r = read, i = insert, u = update, d = delete
 $form["auth_preset"]["perm_other"] = ''; //r = read, i = insert, u = update, d = delete
 
+// Admin always right?
+$wildcard_available = TRUE;
+
 $form["tabs"]['client'] = array(
 	'title'  => "New service",
 	'description' => 'Create domain, mail domain, site, database and ftp/ssh',
@@ -161,6 +164,12 @@ $form["tabs"]['client'] = array(
 			),
 			'value'  => '',	
 		),
+		'subdomain' => array (
+			'datatype' => 'VARCHAR',
+			'formtype' => 'SELECT',
+			'default' => 'template',
+			'value'  => ($wildcard_available ? array('template' => 'use_template_txt', 'none' => 'none_txt', 'www' => 'www.', '*' => '*.') : array('none' => 'none_txt', 'www' => 'www.'))
+		),
 		'db' => array (
 			'datatype' => 'VARCHAR',
 			'formtype' => 'CHECKBOX',
@@ -258,4 +267,4 @@ $form["tabs"]['client'] = array(
 			'value'  => '',	
 		),
 	)
-);
\ No newline at end of file
+);

lib/lang/cz_new_service.lng

@@ -2,6 +2,7 @@
 /* Prelozil dokonaly kosata6 - navstivte www.kosata6.eu */
 $wb["client_id_txt"] = 'Klient';
 $wb["domain_txt"] = 'Doména';
+$wb["username_txt"] = 'Uživatelské jméno';
 $wb["db_txt"] = 'Vytvořit DB';
 $wb["db_type_txt"] = 'DB typ';
 $wb["ftp_txt"] = 'Vytvořit FTP';
@@ -45,4 +46,7 @@ $wb['error_email_empty'] = 'Email prázdné.';
 $wb['error_domain_regex'] = 'Doména obsahuje neplatné znaky.';
 $wb['error_ns1_regex'] = 'NS1 obsahuje neplatné znaky.';
 $wb['error_ns2_regex'] = 'NS2 obsahuje neplatné znaky.';
-$wb['error_email_regex'] = 'Email neosahuje platnou emailovou adresu.';
\ No newline at end of file
+$wb['error_email_regex'] = 'Email neosahuje platnou emailovou adresu.';
+$wb['subdomain_txt'] = 'Automatická subdoména';
+$wb['none_txt'] = 'Žádná';
+$wb['use_template_txt'] = 'Použít hodnotu ze šablony';

lib/lang/cz_template.lng

@@ -82,4 +82,13 @@ $wb['http_port_txt'] = 'HTTP Port';
 $wb['https_port_txt'] = 'HTTPS Port';
 $wb['log_retention_txt'] = 'Logfiles retention time';
 $wb['log_retention_error_regex'] = 'Retention time in days (allowed values: min. 0 - max. 9999)';
-
+$wb["jailkit_chroot_app_sections_txt"] = 'Jailkit chroot app sections';
+$wb["jailkit_chroot_app_programs_txt"] = 'Jailkit chrooted applications';
+$wb["jailkit_chroot_app_sections_error_empty"] = 'Jailkit chroot app sections is empty.';
+$wb["jailkit_chroot_app_programs_error_empty"] = 'Jailkit chrooted applications is empty.';
+$wb['jailkit_chroot_app_sections_error_regex'] = 'Invalid jaikit chroot sections.';
+$wb['jailkit_chroot_app_programs_error_regex'] = 'Invalid jaikit chroot app programs.';
+$wb['tooltip_jailkit_chroot_app_sections_txt'] = 'When empty, uses Jailkit chroot app sections from Server Config';
+$wb['tooltip_jailkit_chroot_app_programs_txt'] = 'When empty, uses Jailkit chroot applications from Server Config';
+$wb['delete_unused_jailkit_txt'] = 'Delete unused jailkit chroot';
+$wb['tooltip_delete_unused_jailkit_txt'] = 'Delete the jailkit chroot environment when there are no shell users or cron jobs which require it.';

lib/lang/en_new_service.lng

@@ -46,4 +46,7 @@ $wb['error_email_empty'] = 'Email empty.';
 $wb['error_domain_regex'] = 'Domain contains invalid characters.';
 $wb['error_ns1_regex'] = 'NS1 contains invalid characters.';
 $wb['error_ns2_regex'] = 'NS2 contains invalid characters.';
-$wb['error_email_regex'] = 'Email does not contain a valid email address.';
\ No newline at end of file
+$wb['error_email_regex'] = 'Email does not contain a valid email address.';
+$wb['subdomain_txt'] = 'Auto-Subdomain';
+$wb['none_txt'] = 'None';
+$wb['use_template_txt'] = 'Use template value';

lib/lang/en_template.lng

@@ -81,3 +81,13 @@ $wb['http_port_txt'] = 'HTTP Port';
 $wb['https_port_txt'] = 'HTTPS Port';
 $wb['log_retention_txt'] = 'Logfiles retention time';
 $wb['log_retention_error_regex'] = 'Retention time in days (allowed values: min. 0 - max. 9999)';
+$wb["jailkit_chroot_app_sections_txt"] = 'Jailkit chroot app sections';
+$wb["jailkit_chroot_app_programs_txt"] = 'Jailkit chrooted applications';
+$wb["jailkit_chroot_app_sections_error_empty"] = 'Jailkit chroot app sections is empty.';
+$wb["jailkit_chroot_app_programs_error_empty"] = 'Jailkit chrooted applications is empty.';
+$wb['jailkit_chroot_app_sections_error_regex'] = 'Invalid jaikit chroot sections.';
+$wb['jailkit_chroot_app_programs_error_regex'] = 'Invalid jaikit chroot app programs.';
+$wb['tooltip_jailkit_chroot_app_sections_txt'] = 'When empty, uses Jailkit chroot app sections from Server Config';
+$wb['tooltip_jailkit_chroot_app_programs_txt'] = 'When empty, uses Jailkit chroot applications from Server Config';
+$wb['delete_unused_jailkit_txt'] = 'Delete unused jailkit chroot';
+$wb['tooltip_delete_unused_jailkit_txt'] = 'Delete the jailkit chroot environment when there are no shell users or cron jobs which require it.';

lib/lang/es_new_service.lng

@@ -45,3 +45,6 @@ $wb['error_domain_regex'] = 'El dominio contiene caracteres erroneos.';
 $wb['error_ns1_regex'] = 'NS1 contiene caracteres erroneos.';
 $wb['error_ns2_regex'] = 'NS2 contiene caracteres erroneos.';
 $wb['error_email_regex'] = 'El Email no contiene una direccion valida.';
+$wb['subdomain_txt'] = 'Auto-Subdominio';
+$wb['none_txt'] = 'Ninguno';
+$wb['use_template_txt'] = 'Use template value';

lib/lang/es_template.lng

@@ -81,3 +81,13 @@ $wb['http_port_txt'] = 'Puerto HTTP';
 $wb['https_port_txt'] = 'Puerto HTTPS';
 $wb['log_retention_txt'] = 'Logfiles retention time';
 $wb['log_retention_error_regex'] = 'Retention time in days (allowed values: min. 0 - max. 9999)';
+$wb["jailkit_chroot_app_sections_txt"] = 'Jailkit chroot app sections';
+$wb["jailkit_chroot_app_programs_txt"] = 'Jailkit chrooted applications';
+$wb["jailkit_chroot_app_sections_error_empty"] = 'Jailkit chroot app sections is empty.';
+$wb["jailkit_chroot_app_programs_error_empty"] = 'Jailkit chrooted applications is empty.';
+$wb['jailkit_chroot_app_sections_error_regex'] = 'Invalid jaikit chroot sections.';
+$wb['jailkit_chroot_app_programs_error_regex'] = 'Invalid jaikit chroot app programs.';
+$wb['tooltip_jailkit_chroot_app_sections_txt'] = 'When empty, uses Jailkit chroot app sections from Server Config';
+$wb['tooltip_jailkit_chroot_app_programs_txt'] = 'When empty, uses Jailkit chroot applications from Server Config';
+$wb['delete_unused_jailkit_txt'] = 'Delete unused jailkit chroot';
+$wb['tooltip_delete_unused_jailkit_txt'] = 'Delete the jailkit chroot environment when there are no shell users or cron jobs which require it.';

new_service.php

@@ -399,7 +399,7 @@ class page_action extends tform_actions {
 			'python' => $template['python'],
 			'perl' => $template['perl'],
 			'errordocs' => $template['errordocs'],
-			'subdomain' => $template['subdomain'],
+			'subdomain' => $fields['subdomain'] == 'template' ? $template['subdomain'] : $fields['subdomain'],
 			'php' => $template['php'],
 			'fastcgi_php_version' => $template['fastcgi_php_version'],
 			'seo_redirect' => $template['seo_redirect'],

templates/new_service.htm

@@ -33,6 +33,14 @@
     </div>
 </div>
 
+<div class="form-group">
+	<label for="subdomain" class="col-sm-3 control-label">{tmpl_var name='subdomain_txt'}</label>
+	<div class="col-sm-9"><select name="subdomain" id="subdomain" class="form-control">
+		{tmpl_var name='subdomain'}
+	</select></div>
+</div>
+
+
 <div class="form-group">
     <label class="col-sm-3 control-label">{tmpl_var name='db_txt'}</label>
     <div class="col-sm-9">

templates/template_site.htm

@@ -221,6 +221,27 @@
 	</div>
 </div>
 
+<div class="jailkit">
+  <div class="form-group">
+    <label class="col-sm-3 control-label">{tmpl_var name='jailkit_chroot_app_sections_txt'}</label>
+    <div class="col-sm-9">
+      <input name="jailkit_chroot_app_sections" id="jailkit_chroot_app_sections" value="{tmpl_var name='jailkit_chroot_app_sections'}" data-toggle="tooltip" title="{tmpl_var name='tooltip_jailkit_chroot_app_sections_txt'}" type="text" class="form-control" />
+    </div>
+  </div>
+  <div class="form-group">
+    <label class="col-sm-3 control-label">{tmpl_var name='jailkit_chroot_app_programs_txt'}</label>
+    <div class="col-sm-9">
+      <input name="jailkit_chroot_app_programs" id="jailkit_chroot_app_programs" value="{tmpl_var name='jailkit_chroot_app_programs'}" data-toggle="tooltip" title="{tmpl_var name='tooltip_jailkit_chroot_app_programs_txt'}" type="text" class="form-control" />
+    </div>
+  </div>
+  <div class="form-group">
+    <label class="col-sm-3 control-label">{tmpl_var name='delete_unused_jailkit_txt'}</label>
+    <div class="col-sm-9">
+      <a data-toggle="tooltip" title="{tmpl_var name='tooltip_delete_unused_jailkit_txt'}">{tmpl_var name='delete_unused_jailkit'}</a>
+    </div>
+  </div>
+</div>
+
 <input type="hidden" name="id" value="{tmpl_var name='id'}">
 
 <div class="clear">
@@ -359,4 +380,4 @@
 	    var new_val = el.val() + t.text();
 	    el.val(new_val).focus();
     });
-</script>
\ No newline at end of file
+</script>