From 4569cae57f127afd093794310ccd290d2d9fdf36 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Wed, 20 Apr 2016 10:58:46 -0400
Subject: [PATCH] Merge branch 'stable-3.1'

---
 server/conf/apache_ispconfig.conf.master |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/server/conf/apache_ispconfig.conf.master b/server/conf/apache_ispconfig.conf.master
index 6b2accb..c965e3f 100644
--- a/server/conf/apache_ispconfig.conf.master
+++ b/server/conf/apache_ispconfig.conf.master
@@ -14,6 +14,13 @@
 	Order Deny,Allow
 	Deny from all
 	</tmpl_if>
+
+ <IfModule mod_headers.c>
+    <LocationMatch "/.well-known/acme-challenge/*">
+      Header set Content-Type "text/plain"
+    </LocationMatch>
+  </IfModule>
+
 </Directory>
 
 # Do not allow access to the root file system of the server for security reasons

--
Gitblit v1.9.1