From b25f400cd6bc255b01e05ac274f050ba4039a411 Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Mon, 21 Dec 2015 05:41:34 -0500
Subject: [PATCH] Merge branch 'master' of git.ispconfig.org:ispconfig/ispconfig3

---
 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