From b9a3ef486ebcde18a5ade37865ff8f397185d24f Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Sun, 24 Jul 2016 05:30:59 -0400
Subject: [PATCH] Fixed #3979 Mailbox users unable to save autoresponders

---
 install/tpl/apache_ispconfig.conf.master |   30 ++++++++++++++++++++++++++----
 1 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/install/tpl/apache_ispconfig.conf.master b/install/tpl/apache_ispconfig.conf.master
index f9062f5..852cb39 100644
--- a/install/tpl/apache_ispconfig.conf.master
+++ b/install/tpl/apache_ispconfig.conf.master
@@ -3,13 +3,13 @@
 # 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>
     AllowOverride None
 	<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
-	Require all deny
+	Require all denied
 	<tmpl_else>
 	Order Deny,Allow
 	Deny from all
@@ -18,9 +18,10 @@
 
 # Do not allow access to the root file system of the server for security reasons
 <Directory />
+	Options -Indexes
     AllowOverride None
 	<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
-	Require all deny
+	Require all denied
 	<tmpl_else>
 	Order Deny,Allow
 	Deny from all
@@ -30,7 +31,7 @@
 <Directory /var/www/conf>
     AllowOverride None
 	<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
-	Require all deny
+	Require all denied
 	<tmpl_else>
 	Order Deny,Allow
 	Deny from all
@@ -48,6 +49,15 @@
 </Directory>
 
 <Directory /usr/share/phpMyAdmin>
+		<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>
+
+<Directory /srv/www/htdocs>
 		<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
 		Require all granted
 		<tmpl_else>
@@ -104,7 +114,19 @@
 		</tmpl_if>
 </Directory>
 
+<tmpl_if name='apache_version' op='<' value='2.4' format='version'>
 Alias /awstats-icon "/usr/share/awstats/icon"
+</tmpl_if>
+
+Alias /.well-known/acme-challenge /usr/local/ispconfig/interface/acme/.well-known/acme-challenge
+<Directory /usr/local/ispconfig/interface/acme/.well-known/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