From f2ea1ac2223dd3c86abe2d41f96b58ea30f8fe61 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Tue, 27 Oct 2009 12:02:32 -0400
Subject: [PATCH] Added: FS#696 - Make the allow override settings configurable per server and website
---
server/conf/vhost.conf.master | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/server/conf/vhost.conf.master b/server/conf/vhost.conf.master
index 950e8f0..ea7c937 100644
--- a/server/conf/vhost.conf.master
+++ b/server/conf/vhost.conf.master
@@ -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>
--
Gitblit v1.9.1