From dfadc85817ae71a7a9bff48ae74bb7293df0d58e Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Thu, 11 Feb 2016 14:04:59 -0500
Subject: [PATCH] Merge branch 'stable-3.1'
---
server/conf/vhost.conf.master | 5 +++++
install/tpl/apache_ispconfig.conf.master | 3 ---
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/install/tpl/apache_ispconfig.conf.master b/install/tpl/apache_ispconfig.conf.master
index 634567c..852cb39 100644
--- a/install/tpl/apache_ispconfig.conf.master
+++ b/install/tpl/apache_ispconfig.conf.master
@@ -122,9 +122,6 @@
<Directory /usr/local/ispconfig/interface/acme/.well-known/acme-challenge>
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
Require all granted
- RewriteEngine on
- RewriteCond %{REQUEST_FILENAME} ^/\.well-known/acme-challenge
- RewriteRule ^ - [END]
<tmpl_else>
Order allow,deny
Allow from all
diff --git a/server/conf/vhost.conf.master b/server/conf/vhost.conf.master
index dbee3a3..23144aa 100644
--- a/server/conf/vhost.conf.master
+++ b/server/conf/vhost.conf.master
@@ -395,6 +395,11 @@
<tmpl_if name="rewrite_enabled">
RewriteEngine on
+<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
+ RewriteEngine on
+ RewriteCond %{REQUEST_URI} ^/\.well-known/acme-challenge/
+ RewriteRule ^ - [END]
+</tmpl_if>
<tmpl_if name='seo_redirect_enabled'>
RewriteCond %{HTTP_HOST} <tmpl_var name='seo_redirect_operator'>^<tmpl_var name='seo_redirect_origin_domain'>$ [NC]
<tmpl_if name='apache_version' op='<' value='2.4' format='version'>RewriteCond %{REQUEST_URI} !^/\.well-known/acme-challenge/</tmpl_if>
--
Gitblit v1.9.1