- another fix for apache 2.4

Marius Burkard

2016-02-11 3a5909cd9f21ae517c850edd0ec0401d012f529f

- another fix for apache 2.4

 install/tpl/apache_ispconfig.conf.master

@@ -119,11 +119,6 @@
</tmpl_if>

Alias /.well-known/acme-challenge /usr/local/ispconfig/interface/acme/.well-known/acme-challenge
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
        RewriteEngine on
        RewriteCond %{REQUEST_FILENAME} ^/\.well-known/acme-challenge
        RewriteRule ^ - [END]
</tmpl_if>
<Directory /usr/local/ispconfig/interface/acme/.well-known/acme-challenge>
        <tmpl_if name='apache_version' op='>' value='2.2' format='version'>
        Require all granted

 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>