From 76ff9735cc28f520a9015f675e8870c0df43a3f8 Mon Sep 17 00:00:00 2001 From: Sebastian Kosch Date: Mon, 25 Aug 2014 13:25:44 -0400 Subject: [PATCH] Move custom server blocks to STORAGE_ROOT --- management/web_update.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/management/web_update.py b/management/web_update.py index 2514bc22..b5528553 100644 --- a/management/web_update.py +++ b/management/web_update.py @@ -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) # 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): nginx_conf += "\tinclude %s;\n" % (nginx_conf_custom_include)