Skip to content
Snippets Groups Projects
Commit 79a71c69 authored by Florian Schaal's avatar Florian Schaal
Browse files

Merge branch 'stable-3.1' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.1

parents 06cf2b45 6c096ff5
No related branches found
No related tags found
1 merge request!1128Stable 3.1
Hide whitespace changes
Inline Side-by-side
server/conf/nginx_vhost.conf.master
+ 1
− 0
View file @ 79a71c69
...@@ -34,6 +34,7 @@ server { ...@@ -34,6 +34,7 @@ server {
server_name <tmpl_var name='domain'> <tmpl_var name='alias'>; server_name <tmpl_var name='domain'> <tmpl_var name='alias'>;
root <tmpl_var name='web_document_root_www'>; root <tmpl_var name='web_document_root_www'>;
disable_symlinks if_not_owner;
<tmpl_if name='ssl_enabled'> <tmpl_if name='ssl_enabled'>
<tmpl_if name='rewrite_to_https' op='==' value='y'> <tmpl_if name='rewrite_to_https' op='==' value='y'>
......
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