From 4569cae57f127afd093794310ccd290d2d9fdf36 Mon Sep 17 00:00:00 2001 From: Marius Burkard <m.burkard@pixcept.de> Date: Wed, 20 Apr 2016 10:58:46 -0400 Subject: [PATCH] Merge branch 'stable-3.1' --- install/tpl/apache_ispconfig.conf.master | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/install/tpl/apache_ispconfig.conf.master b/install/tpl/apache_ispconfig.conf.master index cd9924a..852cb39 100644 --- a/install/tpl/apache_ispconfig.conf.master +++ b/install/tpl/apache_ispconfig.conf.master @@ -118,6 +118,16 @@ Alias /awstats-icon "/usr/share/awstats/icon" </tmpl_if> +Alias /.well-known/acme-challenge /usr/local/ispconfig/interface/acme/.well-known/acme-challenge +<Directory /usr/local/ispconfig/interface/acme/.well-known/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 <tmpl_loop name="ip_adresses"> -- Gitblit v1.9.1