From 6fe5bbcf29f940eb4364471c0688904002946ec8 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Tue, 11 Mar 2014 06:46:43 -0400
Subject: [PATCH] Merge branch 'apache24-fixes' into 'master'
---
server/conf/vhost.conf.master | 4 ++--
server/conf/apache_ispconfig.conf.master | 6 +++---
install/tpl/apache_ispconfig.conf.master | 6 +++---
3 files changed, 8 insertions(+), 8 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..62a9199 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
@@ -351,4 +351,4 @@
<tmpl_var name='apache_directives'>
</VirtualHost>
-</tmpl_loop>
\ No newline at end of file
+</tmpl_loop>
--
Gitblit v1.9.1