From f686264ad6d82cfaf4e401da2e259880f57bfade Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Sat, 30 Jan 2016 07:44:29 -0500
Subject: [PATCH] Merge branch 'master' into 'stable-3.1'
---
server/conf/apache_ispconfig.conf.master | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/server/conf/apache_ispconfig.conf.master b/server/conf/apache_ispconfig.conf.master
index be6f637..c965e3f 100644
--- a/server/conf/apache_ispconfig.conf.master
+++ b/server/conf/apache_ispconfig.conf.master
@@ -3,7 +3,7 @@
# ISPConfig Logfile configuration for vlogger
################################################
-LogFormat "%v %h %l %u %t \"%r\" %>s %B \"%{Referer}i\" \"%{User-Agent}i\"" combined_ispconfig
+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
<Directory /var/www/clients>
@@ -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