From 36420c614b259a0ca1aa7db14b1215db60c4c5ce Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Fri, 04 Apr 2014 03:50:13 -0400
Subject: [PATCH] Merge remote-tracking branch 'origin/stable-3.0.5'

---
 install/tpl/apache_ispconfig.conf.master |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/install/tpl/apache_ispconfig.conf.master b/install/tpl/apache_ispconfig.conf.master
index db6cb40..be6f637 100644
--- a/install/tpl/apache_ispconfig.conf.master
+++ b/install/tpl/apache_ispconfig.conf.master
@@ -56,6 +56,15 @@
 		</tmpl_if>
 </Directory>
 
+<Directory /srv/www/htdocs>
+		<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
+		Require all granted
+		<tmpl_else>
+        Order allow,deny
+        Allow from all
+		</tmpl_if>
+</Directory>
+
 <Directory /usr/share/squirrelmail>
 		<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
 		Require all granted

--
Gitblit v1.9.1