ISPConfig3 devel
parent: aad102f7 | patch | commit | ignore whitespace
Till Brehm
2016-07-19 6f9a41aaed1ddc5dde6940e03249ba20b535b2f0 
Merge branch 'stable-3.1' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.1
1 files modified
3 ■■■■■ changed files
server/conf/vhost.conf.master 3 ●●●●● patch | view | raw | blame | history 
 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>