From 7ae7e8f77c877334df4818ef892d9a525de0fd25 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Tue, 11 Mar 2014 06:49:38 -0400
Subject: [PATCH] Apache 2.4 fix from master (Marc Schütz)
---
server/conf/vhost.conf.master | 2 +-
server/conf/apache_ispconfig.conf.master | 6 +++---
install/tpl/apache_ispconfig.conf.master | 6 +++---
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/install/tpl/apache_ispconfig.conf.master b/install/tpl/apache_ispconfig.conf.master
index f9062f5..6873e53 100644
--- a/install/tpl/apache_ispconfig.conf.master
+++ b/install/tpl/apache_ispconfig.conf.master
@@ -9,7 +9,7 @@
<Directory /var/www/clients>
AllowOverride None
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
- Require all deny
+ Require all denied
<tmpl_else>
Order Deny,Allow
Deny from all
@@ -20,7 +20,7 @@
<Directory />
AllowOverride None
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
- Require all deny
+ Require all denied
<tmpl_else>
Order Deny,Allow
Deny from all
@@ -30,7 +30,7 @@
<Directory /var/www/conf>
AllowOverride None
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
- Require all deny
+ Require all denied
<tmpl_else>
Order Deny,Allow
Deny from all
diff --git a/server/conf/apache_ispconfig.conf.master b/server/conf/apache_ispconfig.conf.master
index f9062f5..6873e53 100644
--- a/server/conf/apache_ispconfig.conf.master
+++ b/server/conf/apache_ispconfig.conf.master
@@ -9,7 +9,7 @@
<Directory /var/www/clients>
AllowOverride None
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
- Require all deny
+ Require all denied
<tmpl_else>
Order Deny,Allow
Deny from all
@@ -20,7 +20,7 @@
<Directory />
AllowOverride None
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
- Require all deny
+ Require all denied
<tmpl_else>
Order Deny,Allow
Deny from all
@@ -30,7 +30,7 @@
<Directory /var/www/conf>
AllowOverride None
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
- Require all deny
+ Require all denied
<tmpl_else>
Order Deny,Allow
Deny from all
diff --git a/server/conf/vhost.conf.master b/server/conf/vhost.conf.master
index 2e90dde..06a16fc 100644
--- a/server/conf/vhost.conf.master
+++ b/server/conf/vhost.conf.master
@@ -2,7 +2,7 @@
<Directory {tmpl_var name='web_basedir'}/{tmpl_var name='domain'}>
AllowOverride None
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
- Require all deny
+ Require all denied
<tmpl_else>
Order Deny,Allow
Deny from all
--
Gitblit v1.9.1