Merge branch 'stable-3.1'

Marius Burkard

2016-02-11 dfadc85817ae71a7a9bff48ae74bb7293df0d58e

Merge branch 'stable-3.1'

 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

 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>