Commit f2ea1ac2 authored by tbrehm's avatar tbrehm
Browse files

Added: FS#696 - Make the allow override settings configurable per server and website

parent 5734aa45
......@@ -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`)
......
......@@ -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
......@@ -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');
......
......@@ -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',
......
......@@ -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';
?>
......@@ -16,6 +16,10 @@
<label for="system_group">{tmpl_var name='system_group'}</label>
<input name="system_group" id="system_group" value="{tmpl_var name='system_group'}" type="hidden" />
</div>
<div class="ctrlHolder">
<label for="allow_override">{tmpl_var name='allow_override_txt'}</label>
<input name="allow_override" id="allow_override" value="{tmpl_var name='allow_override'}" size="30" maxlength="255" type="text" class="textInput" />
</div
<div class="ctrlHolder">
<label for="apache_directives">{tmpl_var name='apache_directives_txt'}</label>
<textarea name="apache_directives" id="apache_directives" rows='10' cols='30'>{tmpl_var name='apache_directives'}</textarea>
......
......@@ -36,7 +36,7 @@
<Directory {tmpl_var name='web_document_root_www'}>
Options FollowSymLinks
AllowOverride All
AllowOverride <tmpl_var name='allow_override'>
Order allow,deny
Allow from all
<tmpl_if name='ssi' op='==' value='y'>
......@@ -56,7 +56,7 @@
</Directory>
<Directory {tmpl_var name='web_document_root'}>
Options FollowSymLinks
AllowOverride All
AllowOverride <tmpl_var name='allow_override'>
Order allow,deny
Allow from all
<tmpl_if name='ssi' op='==' value='y'>
......@@ -124,7 +124,7 @@
AddHandler fcgid-script .php .php3 .php4 .php5
FCGIWrapper <tmpl_var name='fastcgi_starter_path'><tmpl_var name='fastcgi_starter_script'> .php
Options +ExecCGI
AllowOverride all
AllowOverride <tmpl_var name='allow_override'>
Order allow,deny
Allow from all
</Directory>
......@@ -192,7 +192,7 @@
<Directory {tmpl_var name='web_document_root_www'}>
Options FollowSymLinks
AllowOverride All
AllowOverride <tmpl_var name='allow_override'>
Order allow,deny
Allow from all
<tmpl_if name='ssi' op='==' value='y'>
......@@ -212,7 +212,7 @@
</Directory>
<Directory {tmpl_var name='web_document_root'}>
Options FollowSymLinks
AllowOverride All
AllowOverride <tmpl_var name='allow_override'>
Order allow,deny
Allow from all
<tmpl_if name='ssi' op='==' value='y'>
......@@ -282,7 +282,7 @@
AddHandler fcgid-script .php .php3 .php4 .php5
FCGIWrapper <tmpl_var name='fastcgi_starter_path'><tmpl_var name='fastcgi_starter_script'> .php
Options +ExecCGI
AllowOverride all
AllowOverride <tmpl_var name='allow_override'>
Order allow,deny
Allow from all
</Directory>
......
......@@ -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";
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment