Merge branch 'stable-3.1'

Marius Burkard

2016-07-10 e1ceb050e19c7574bca146a8da7047ee4ff456b5

 server/conf/nginx_vhost.conf.master

@@ -112,7 +112,7 @@
        access_log /var/log/ispconfig/httpd/<tmpl_var name='domain'>/access.log combined;

        ## Disable .htaccess and other hidden files
        location ~ /\. {
        location ~ /\.(?!well-known/acme-challenge/) {
            deny all;
            access_log off;
            log_not_found off;
@@ -263,6 +263,13 @@
        }
</tmpl_if>

location ~ /\.well-known/acme-challenge/ {
      root /usr/local/ispconfig/interface/acme/;
      index index.html index.htm;
      try_files $uri =404;
}


<tmpl_loop name="basic_auth_locations">
        location <tmpl_var name='htpasswd_location'> { ##merge##
                auth_basic "Members Only";
@@ -293,6 +300,13 @@
</tmpl_if>
        
        server_name <tmpl_var name='rewrite_domain'>;

location ~ /\.well-known/acme-challenge/ {
      root /usr/local/ispconfig/interface/acme/;
      index index.html index.htm;
      try_files $uri =404;
}

<tmpl_if name='alias_seo_redirects2'>
<tmpl_loop name="alias_seo_redirects2">
        if ($http_host <tmpl_var name='alias_seo_redirect_operator'> "<tmpl_var name='alias_seo_redirect_origin_domain'>") {