From 897af06af9522ded99b1e0f46730299e89856ffe Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Mon, 11 Jun 2012 05:00:57 -0400
Subject: [PATCH] Updated version number to 3.0.4.6
---
interface/web/admin/form/server_config.tform.php | 130 ++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 127 insertions(+), 3 deletions(-)
diff --git a/interface/web/admin/form/server_config.tform.php b/interface/web/admin/form/server_config.tform.php
index 9a36919..b1e1d94 100644
--- a/interface/web/admin/form/server_config.tform.php
+++ b/interface/web/admin/form/server_config.tform.php
@@ -325,7 +325,7 @@
'datatype' => 'VARCHAR',
'formtype' => 'SELECT',
'default' => 'apache',
- 'value' => array('apache' => 'Apache', 'nginx' => 'nginx')
+ 'value' => array('apache' => 'Apache', 'nginx' => 'Nginx')
),
'website_basedir' => array(
'datatype' => 'VARCHAR',
@@ -432,7 +432,25 @@
'default' => '20',
'value' => array('10' => 'Medium', '20' => 'High')
),
+ 'set_folder_permissions_on_update' => array(
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'CHECKBOX',
+ 'default' => 'y',
+ 'value' => array(0 => 'n', 1 => 'y')
+ ),
+ 'add_web_users_to_sshusers_group' => array(
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'CHECKBOX',
+ 'default' => 'y',
+ 'value' => array(0 => 'n', 1 => 'y')
+ ),
'check_apache_config' => array(
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'CHECKBOX',
+ 'default' => 'y',
+ 'value' => array(0 => 'n', 1 => 'y')
+ ),
+ 'enable_sni' => array(
'datatype' => 'VARCHAR',
'formtype' => 'CHECKBOX',
'default' => 'y',
@@ -460,6 +478,45 @@
'width' => '40',
'maxlength' => '255'
),
+ 'connect_userid_to_webid' => array(
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'CHECKBOX',
+ 'default' => 'n',
+ 'value' => array(0 => 'n', 1 => 'y')
+ ),
+ 'connect_userid_to_webid_start' => array(
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'TEXT',
+ 'default' => '10000',
+ 'validators' => array(0 => array('type' => 'ISINT',
+ 'errmsg' => 'connect_userid_to_webid_startid_isint'),
+ ),
+ 'value' => '',
+ 'width' => '40',
+ 'maxlength' => '255'
+ ),
+ 'nginx_user' => array(
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'TEXT',
+ 'default' => '',
+ 'validators' => array(0 => array('type' => 'NOTEMPTY',
+ 'errmsg' => 'nginx_user_error_empty'),
+ ),
+ 'value' => '',
+ 'width' => '40',
+ 'maxlength' => '255'
+ ),
+ 'nginx_group' => array(
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'TEXT',
+ 'default' => '',
+ 'validators' => array(0 => array('type' => 'NOTEMPTY',
+ 'errmsg' => 'nginx_group_error_empty'),
+ ),
+ 'value' => '',
+ 'width' => '40',
+ 'maxlength' => '255'
+ ),
'php_ini_path_apache' => array(
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
@@ -482,6 +539,61 @@
'width' => '40',
'maxlength' => '255'
),
+ 'php_fpm_init_script' => array(
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'TEXT',
+ 'default' => '',
+ 'validators' => array(0 => array('type' => 'NOTEMPTY',
+ 'errmsg' => 'php_fpm_init_script_error_empty'),
+ ),
+ 'value' => '',
+ 'width' => '40',
+ 'maxlength' => '255'
+ ),
+ 'php_fpm_ini_path' => array(
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'TEXT',
+ 'default' => '',
+ 'validators' => array(0 => array('type' => 'NOTEMPTY',
+ 'errmsg' => 'php_fpm_ini_path_error_empty'),
+ ),
+ 'value' => '',
+ 'width' => '40',
+ 'maxlength' => '255'
+ ),
+ 'php_fpm_pool_dir' => array(
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'TEXT',
+ 'default' => '',
+ 'validators' => array(0 => array('type' => 'NOTEMPTY',
+ 'errmsg' => 'php_fpm_pool_dir_error_empty'),
+ ),
+ 'value' => '',
+ 'width' => '40',
+ 'maxlength' => '255'
+ ),
+ 'php_fpm_start_port' => array(
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'TEXT',
+ 'default' => '',
+ 'validators' => array(0 => array('type' => 'NOTEMPTY',
+ 'errmsg' => 'php_fpm_start_port_error_empty'),
+ ),
+ 'value' => '',
+ 'width' => '40',
+ 'maxlength' => '255'
+ ),
+ 'php_fpm_socket_dir' => array(
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'TEXT',
+ 'default' => '',
+ 'validators' => array(0 => array('type' => 'NOTEMPTY',
+ 'errmsg' => 'php_fpm_socket_dir_error_empty'),
+ ),
+ 'value' => '',
+ 'width' => '40',
+ 'maxlength' => '255'
+ ),
'php_open_basedir' => array(
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
@@ -492,6 +604,17 @@
'value' => '',
'width' => '40',
'maxlength' => '4000'
+ ),
+ 'nginx_cgi_socket' => array(
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'TEXT',
+ 'default' => '',
+ 'validators' => array(0 => array('type' => 'NOTEMPTY',
+ 'errmsg' => 'nginx_cgi_socket_empty'),
+ ),
+ 'value' => '',
+ 'width' => '40',
+ 'maxlength' => '255'
),
'htaccess_allow_override' => array(
'datatype' => 'VARCHAR',
@@ -799,6 +922,7 @@
)
);
+/*
$form["tabs"]['ufw_firewall'] = array (
'title' => "UFW Firewall",
'width' => 80,
@@ -860,7 +984,7 @@
##################################
)
);
-
+*/
$form["tabs"]['vlogger'] = array(
'title' => "vlogger",
@@ -950,7 +1074,7 @@
'default' => 'n',
'value' => array(0 => 'n', 1 => 'y')
),
- 'do_not_try_rescue_apache' => array(
+ 'do_not_try_rescue_httpd' => array(
'datatype' => 'VARCHAR',
'formtype' => 'CHECKBOX',
'default' => 'n',
--
Gitblit v1.9.1