From c3189ce6c7301c3ec17878fd3918f31d0d3cb18a Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Wed, 04 May 2016 07:27:53 -0400
Subject: [PATCH] Merge branch 'stable-3.1'
---
server/conf/apache_ispconfig.conf.master | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/server/conf/apache_ispconfig.conf.master b/server/conf/apache_ispconfig.conf.master
index c965e3f..79acb9c 100644
--- a/server/conf/apache_ispconfig.conf.master
+++ b/server/conf/apache_ispconfig.conf.master
@@ -6,6 +6,12 @@
LogFormat "%v %h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" combined_ispconfig
CustomLog "| /usr/local/ispconfig/server/scripts/vlogger -s access.log -t \"%Y%m%d-access.log\" /var/log/ispconfig/httpd" combined_ispconfig
+<IfModule mod_headers.c>
+ <LocationMatch "/.well-known/acme-challenge/*">
+ Header set Content-Type "text/plain"
+ </LocationMatch>
+</IfModule>
+
<Directory /var/www/clients>
AllowOverride None
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
@@ -14,13 +20,6 @@
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