Commit 6363e269 authored by Marius Burkard's avatar Marius Burkard
Browse files

Merge branch 'stable-3.1' into 'stable-3.1'

changed template for nginx + LE



See merge request !526
parents 7668f973 ef90930f
...@@ -114,10 +114,18 @@ server { ...@@ -114,10 +114,18 @@ server {
access_log /var/log/ispconfig/httpd/<tmpl_var name='domain'>/access.log combined; access_log /var/log/ispconfig/httpd/<tmpl_var name='domain'>/access.log combined;
## Disable .htaccess and other hidden files ## Disable .htaccess and other hidden files
location ~ /\.(?!well-known/acme-challenge/) { location ~ /\. {
deny all; deny all;
access_log off; }
log_not_found off;
## Allow access for .well-known/acme-challenge
location ^~ /.well-known/acme-challenge/ {
access_log off;
log_not_found off;
root /usr/local/ispconfig/interface/acme/;
autoindex off;
index index.html;
try_files $uri $uri/ =404;
} }
location = /favicon.ico { location = /favicon.ico {
...@@ -303,12 +311,6 @@ server { ...@@ -303,12 +311,6 @@ server {
server_name <tmpl_var name='rewrite_domain'>; 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_if name='alias_seo_redirects2'>
<tmpl_loop 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'>") { if ($http_host <tmpl_var name='alias_seo_redirect_operator'> "<tmpl_var name='alias_seo_redirect_origin_domain'>") {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment