From f2ea1ac2223dd3c86abe2d41f96b58ea30f8fe61 Mon Sep 17 00:00:00 2001 From: tbrehm Date: Tue, 27 Oct 2009 16:02:32 +0000 Subject: [PATCH] Added: FS#696 - Make the allow override settings configurable per server and website --- install/sql/ispconfig3.sql | 1 + interface/web/admin/lib/lang/en.lng | 3 ++- interface/web/admin/lib/module.conf.php | 4 ++-- interface/web/sites/form/web_domain.tform.php | 11 +++++++++++ interface/web/sites/lib/lang/en_web_domain.lng | 1 + .../web/sites/templates/web_domain_advanced.htm | 4 ++++ server/conf/vhost.conf.master | 12 ++++++------ server/plugins-available/apache2_plugin.inc.php | 1 + 8 files changed, 28 insertions(+), 9 deletions(-) diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql index 017423f85f..c236f7c627 100644 --- a/install/sql/ispconfig3.sql +++ b/install/sql/ispconfig3.sql @@ -1028,6 +1028,7 @@ CREATE TABLE `web_domain` ( `ssl_bundle` mediumtext NULL, `ssl_action` varchar(16) NULL, `stats_password` varchar(255) default NULL, + `allow_override` varchar(32) NOT NULL default 'All', `apache_directives` text, `active` enum('n','y') NOT NULL default 'y', PRIMARY KEY (`domain_id`) diff --git a/interface/web/admin/lib/lang/en.lng b/interface/web/admin/lib/lang/en.lng index 4d0b01de95..3a12de9873 100644 --- a/interface/web/admin/lib/lang/en.lng +++ b/interface/web/admin/lib/lang/en.lng @@ -22,7 +22,7 @@ $wb['Add group'] = 'Add group'; $wb['Edit group'] = 'Edit group'; $wb['Groups'] = 'Groups'; $wb['Edit server'] = 'Edit server'; -$wb['Edit Server IP'] = 'Edit Server IP'; +$wb['Edit Server IP'] = 'Server IP addresses'; $wb['Servers'] = 'Servers'; $wb['Sync. Now'] = 'Sync. Now'; $wb['DB Sync.'] = 'DB Sync.'; @@ -33,5 +33,6 @@ $wb['Import'] = 'Import'; $wb['Language Editor'] = 'Language Editor'; $wb['Software'] = 'Software'; $wb['Repositories'] = 'Repositories'; +$wb['Server Services'] = 'Server Services'; ?> \ No newline at end of file diff --git a/interface/web/admin/lib/module.conf.php b/interface/web/admin/lib/module.conf.php index 636ea72794..472b90cfb1 100644 --- a/interface/web/admin/lib/module.conf.php +++ b/interface/web/admin/lib/module.conf.php @@ -5,7 +5,7 @@ global $conf; $module['name'] = 'admin'; $module['title'] = 'System'; $module['template'] = 'module.tpl.htm'; -$module['startpage'] = 'admin/users_list.php'; +$module['startpage'] = 'admin/server_list.php'; $module['tab_width'] = '60'; @@ -47,7 +47,7 @@ $items[] = array( 'title' => 'Add server', 'target' => 'content', 'link' => 'admin/server_edit.php'); */ -$items[] = array( 'title' => 'Edit server', +$items[] = array( 'title' => 'Server Services', 'target' => 'content', 'link' => 'admin/server_list.php'); diff --git a/interface/web/sites/form/web_domain.tform.php b/interface/web/sites/form/web_domain.tform.php index df2b75ae45..eadc2d7bbb 100644 --- a/interface/web/sites/form/web_domain.tform.php +++ b/interface/web/sites/form/web_domain.tform.php @@ -399,6 +399,17 @@ $form["tabs"]['advanced'] = array ( 'width' => '30', 'maxlength' => '255' ), + 'allow_override' => array ( + 'datatype' => 'VARCHAR', + 'formtype' => 'TEXT', + 'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY', + 'errmsg'=> 'documentroot_error_empty'), + ), + 'default' => 'All', + 'value' => '', + 'width' => '30', + 'maxlength' => '255' + ), 'apache_directives' => array ( 'datatype' => 'TEXT', 'formtype' => 'TEXT', diff --git a/interface/web/sites/lib/lang/en_web_domain.lng b/interface/web/sites/lib/lang/en_web_domain.lng index 62e625abc6..109d8e7af4 100644 --- a/interface/web/sites/lib/lang/en_web_domain.lng +++ b/interface/web/sites/lib/lang/en_web_domain.lng @@ -47,4 +47,5 @@ $wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.'; $wb['error_ssl_country_empty'] = 'SSL Country is empty.'; $wb["client_group_id_txt"] = 'Client'; $wb["stats_password_txt"] = 'Webstatistics password'; +$wb["allow_override_txt"] = 'Allow Override'; ?> diff --git a/interface/web/sites/templates/web_domain_advanced.htm b/interface/web/sites/templates/web_domain_advanced.htm index 6580905055..3e70de941e 100644 --- a/interface/web/sites/templates/web_domain_advanced.htm +++ b/interface/web/sites/templates/web_domain_advanced.htm @@ -16,6 +16,10 @@ +
+ + +
diff --git a/server/conf/vhost.conf.master b/server/conf/vhost.conf.master index 950e8f0ed8..ea7c9370ef 100644 --- a/server/conf/vhost.conf.master +++ b/server/conf/vhost.conf.master @@ -36,7 +36,7 @@ Options FollowSymLinks - AllowOverride All + AllowOverride Order allow,deny Allow from all @@ -56,7 +56,7 @@ Options FollowSymLinks - AllowOverride All + AllowOverride Order allow,deny Allow from all @@ -124,7 +124,7 @@ AddHandler fcgid-script .php .php3 .php4 .php5 FCGIWrapper .php Options +ExecCGI - AllowOverride all + AllowOverride Order allow,deny Allow from all @@ -192,7 +192,7 @@ Options FollowSymLinks - AllowOverride All + AllowOverride Order allow,deny Allow from all @@ -212,7 +212,7 @@ Options FollowSymLinks - AllowOverride All + AllowOverride Order allow,deny Allow from all @@ -282,7 +282,7 @@ AddHandler fcgid-script .php .php3 .php4 .php5 FCGIWrapper .php Options +ExecCGI - AllowOverride all + AllowOverride Order allow,deny Allow from all diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php index 7af0653b18..5b69403905 100644 --- a/server/plugins-available/apache2_plugin.inc.php +++ b/server/plugins-available/apache2_plugin.inc.php @@ -554,6 +554,7 @@ class apache2_plugin { $vhost_data["web_document_root_www"] = $web_config["website_basedir"]."/".$data["new"]["domain"]."/web"; $vhost_data["web_basedir"] = $web_config["website_basedir"]; $vhost_data["security_level"] = $web_config["security_level"]; + $vhost_data["allow_override"] = ($data["new"]["allow_override"] == '')?'All':$data["new"]["allow_override"]; // Check if a SSL cert exists $ssl_dir = $data["new"]["document_root"]."/ssl"; -- GitLab