Merge branch 'stable-3.1'

Marius Burkard

2016-05-04 c3189ce6c7301c3ec17878fd3918f31d0d3cb18a

 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;
}