From c3189ce6c7301c3ec17878fd3918f31d0d3cb18a Mon Sep 17 00:00:00 2001 From: Marius Burkard <m.burkard@pixcept.de> Date: Wed, 04 May 2016 07:27:53 -0400 Subject: [PATCH] Merge branch 'stable-3.1' --- server/conf/nginx_vhost.conf.master | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/server/conf/nginx_vhost.conf.master b/server/conf/nginx_vhost.conf.master index 67f1ee0..f057088 100644 --- a/server/conf/nginx_vhost.conf.master +++ b/server/conf/nginx_vhost.conf.master @@ -263,8 +263,8 @@ } </tmpl_if> -location /\.well-known/acme-challenge { - root /usr/local/ispconfig/interface/acme/.well-known/acme-challenge; +location ~ /\.well-known/acme-challenge/ { + root /usr/local/ispconfig/interface/acme/; index index.html index.htm; try_files $uri =404; } @@ -301,8 +301,8 @@ server_name <tmpl_var name='rewrite_domain'>; -location /\.well-known/acme-challenge { - root /usr/local/ispconfig/interface/acme-challenge; +location ~ /\.well-known/acme-challenge/ { + root /usr/local/ispconfig/interface/acme/; index index.html index.htm; try_files $uri =404; } -- Gitblit v1.9.1