Merge branch 'master' into 'stable-3.1'

After enabling "Rewrite HTTP to HTTPS" and "Lets Encrypt SSL" the RewriteCond an…

After enabling "Rewrite HTTP to HTTPS" and "Lets Encrypt SSL" the RewriteCond and RewriteRule got on the same line, becourse of an failing newline


root@sv-vs-15:/etc/apache2/sites-available# /etc/init.d/apache2 restart
Syntax error on line 276 of /etc/apache2/sites-enabled/100-domain.nl.vhost:
RewriteCond: bad flag delimiters
Action 'configtest' failed.
The Apache error log may have more information.
   ...fail!


See merge request !381

Author: Till Brehm

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>