mirror of
https://github.com/mail-in-a-box/mailinabox.git
synced 2024-11-22 02:17:26 +00:00
Add server block customizations
This allows users to add a file /etc/nginx/conf.d/includes/mydomain.com.conf, the contents of which will be included in the server block for mydomain.com.
This commit is contained in:
parent
28231ac248
commit
9bfff1f679
@ -94,7 +94,7 @@ def make_domain_config(domain, template, template_for_primaryhost, env):
|
|||||||
nginx_conf = nginx_conf.replace("$SSL_KEY", ssl_key)
|
nginx_conf = nginx_conf.replace("$SSL_KEY", ssl_key)
|
||||||
nginx_conf = nginx_conf.replace("$SSL_CERTIFICATE", ssl_certificate)
|
nginx_conf = nginx_conf.replace("$SSL_CERTIFICATE", ssl_certificate)
|
||||||
|
|
||||||
# Add in any user customizations.
|
# Add in any user customizations in YAML format.
|
||||||
nginx_conf_custom_fn = os.path.join(env["STORAGE_ROOT"], "www/custom.yaml")
|
nginx_conf_custom_fn = os.path.join(env["STORAGE_ROOT"], "www/custom.yaml")
|
||||||
if os.path.exists(nginx_conf_custom_fn):
|
if os.path.exists(nginx_conf_custom_fn):
|
||||||
yaml = rtyaml.load(open(nginx_conf_custom_fn))
|
yaml = rtyaml.load(open(nginx_conf_custom_fn))
|
||||||
@ -103,6 +103,11 @@ def make_domain_config(domain, template, template_for_primaryhost, env):
|
|||||||
for path, url in yaml.get("proxies", {}).items():
|
for path, url in yaml.get("proxies", {}).items():
|
||||||
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.
|
||||||
|
nginx_conf_custom_include = os.path.join("/etc/nginx/conf.d/includes/", domain + ".conf")
|
||||||
|
if os.path.exists(nginx_conf_custom_include):
|
||||||
|
nginx_conf += "\tinclude %s;\n" % (nginx_conf_custom_include)
|
||||||
|
|
||||||
# Ending.
|
# Ending.
|
||||||
nginx_conf += nginx_conf_parts[1]
|
nginx_conf += nginx_conf_parts[1]
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user