From 0e8c9aeef967fd3437d3d1a8df917724d4bebf0f Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Thu, 11 Feb 2016 12:10:57 -0500
Subject: [PATCH] Merge branch 'stable-3.1'

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

diff --git a/install/tpl/apache_ispconfig.conf.master b/install/tpl/apache_ispconfig.conf.master
index c65d6d3..4a125b1 100644
--- a/install/tpl/apache_ispconfig.conf.master
+++ b/install/tpl/apache_ispconfig.conf.master
@@ -119,6 +119,14 @@
 </tmpl_if>
 
 Alias /.well-known/acme-challenge /usr/local/ispconfig/interface/acme-challenge
+<Directory /usr/local/ispconfig/interface/acme-challenge>
+		<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>
 
 NameVirtualHost *:80
 NameVirtualHost *:443

--
Gitblit v1.9.1