Merge branch 'stable-3.1'

Marius Burkard

2016-02-11 0e8c9aeef967fd3437d3d1a8df917724d4bebf0f

Merge branch 'stable-3.1'

 install/tpl/apache_ispconfig.conf.master

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

Alias /.well-known/acme-challenge /usr/local/ispconfig/interface/acme-challenge
<Directory /usr/local/ispconfig/interface/acme-challenge>
        <tmpl_if name='apache_version' op='>' value='2.2' format='version'>
        Require all granted
        <tmpl_else>
        Order allow,deny
        Allow from all
        </tmpl_if>
</Directory>

NameVirtualHost *:80
NameVirtualHost *:443