From 17d2fb64652b1ea801672fd447fd24319d36af81 Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Tue, 19 Jul 2016 11:20:28 -0400
Subject: [PATCH] Merge branch 'master' into 'stable-3.1'
---
server/conf/vhost.conf.master | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/server/conf/vhost.conf.master b/server/conf/vhost.conf.master
index bb2d71d..442d630 100644
--- a/server/conf/vhost.conf.master
+++ b/server/conf/vhost.conf.master
@@ -430,7 +430,8 @@
<tmpl_else>
<tmpl_if name='rewrite_to_https' op='==' value='y'>
RewriteCond %{HTTPS} off
- <tmpl_if name='apache_version' op='<' value='2.4' format='version'>RewriteCond %{REQUEST_URI} !^/\.well-known/acme-challenge/</tmpl_if>
+ <tmpl_if name='apache_version' op='<' value='2.4' format='version'>RewriteCond %{REQUEST_URI} !^/\.well-known/acme-challenge/
+</tmpl_if>
RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI} [R=301,L]
</tmpl_if>
</tmpl_if>
--
Gitblit v1.9.1