external
/
mailinabox
mirror of https://github.com/mail-in-a-box/mailinabox.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Move custom server blocks to STORAGE_ROOT

This commit is contained in:
Sebastian Kosch 2014-08-25 13:25:44 -04:00
parent 9bfff1f679
commit 76ff9735cc
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
management/web_update.py
View File

@ -104,7 +104,7 @@ def make_domain_config(domain, template, template_for_primaryhost, env):
nginx_conf += "\tlocation %s {\n\t\tproxy_pass %s;\n\t}\n" % (path, url) nginx_conf += "\tlocation %s {\n\t\tproxy_pass %s;\n\t}\n" % (path, url)
# Add in any user customizations in the includes/ folder. # Add in any user customizations in the includes/ folder.
nginx_conf_custom_include = os.path.join("/etc/nginx/conf.d/includes/", domain + ".conf") nginx_conf_custom_include = os.path.join(env["STORAGE_ROOT"], "www", safe_domain_name(test_domain) + ".conf")
if os.path.exists(nginx_conf_custom_include): if os.path.exists(nginx_conf_custom_include):
nginx_conf += "\tinclude %s;\n" % (nginx_conf_custom_include) nginx_conf += "\tinclude %s;\n" % (nginx_conf_custom_include)