external/mailinabox
1
0
Fork 0
mirror of https://github.com/mail-in-a-box/mailinabox.git synced 2024-11-24 02:37:05 +00:00
Code Issues Releases Wiki Activity

Added subfile generation for web_update.py

Browse Source
This commit is contained in:
Justus Wingert 2023-08-14 16:03:48 +02:00 committed by GitHub
parent cd45d08409
commit d29b502369
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 27 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
management/web_update.py
View File

@ -82,7 +82,7 @@ def do_web_update(env):
return f.read() return f.read()
# Build an nginx configuration file. # Build an nginx configuration file.
nginx_conf = read_conf("nginx-top.conf") nginx_conf = [("nginx-top", read_conf("nginx-top.conf")), ]
# Load the templates. # Load the templates.
template0 = read_conf("nginx.conf") template0 = read_conf("nginx.conf")
@ -91,7 +91,7 @@ def do_web_update(env):
template3 = "\trewrite ^(.*) https://$REDIRECT_DOMAIN$1 permanent;\n" template3 = "\trewrite ^(.*) https://$REDIRECT_DOMAIN$1 permanent;\n"
# Add the PRIMARY_HOST configuration first so it becomes nginx's default server. # Add the PRIMARY_HOST configuration first so it becomes nginx's default server.
nginx_conf += make_domain_config(env['PRIMARY_HOSTNAME'], [template0, template1, template2], ssl_certificates, env) nginx_conf.append((env['PRIMARY_HOSTNAME'], make_domain_config(env['PRIMARY_HOSTNAME'], [template0, template1, template2], ssl_certificates, env)))
# Add configuration all other web domains. # Add configuration all other web domains.
has_root_proxy_or_redirect = get_web_domains_with_root_overrides(env) has_root_proxy_or_redirect = get_web_domains_with_root_overrides(env)
@ -103,31 +103,37 @@ def do_web_update(env):
if domain in web_domains_not_redirect: if domain in web_domains_not_redirect:
# This is a regular domain. # This is a regular domain.
if domain not in has_root_proxy_or_redirect: if domain not in has_root_proxy_or_redirect:
nginx_conf += make_domain_config(domain, [template0, template1], ssl_certificates, env) nginx_conf.append((domain, make_domain_config(domain, [template0, template1], ssl_certificates, env)))
else: else:
nginx_conf += make_domain_config(domain, [template0], ssl_certificates, env) nginx_conf.append((domain, make_domain_config(domain, [template0], ssl_certificates, env)))
else: else:
# Add default 'www.' redirect. # Add default 'www.' redirect.
nginx_conf += make_domain_config(domain, [template0, template3], ssl_certificates, env) nginx_conf.append((domain, make_domain_config(domain, [template0, template3], ssl_certificates, env)))
# Did the file change? If not, don't bother writing & restarting nginx. # Did the files change? If not, don't bother writing & restarting nginx.
nginx_conf_fn = "/etc/nginx/conf.d/local.conf" kick = False
if os.path.exists(nginx_conf_fn): for domain, conf in nginx_conf:
with open(nginx_conf_fn) as f: nginx_conf_fn = "/etc/nginx/sites-available/%s" % domain
if f.read() == nginx_conf: if os.path.exists(nginx_conf_fn):
return "" with open(nginx_conf_fn) as f:
if f.read() == conf:
continue
# Save the file. # Save the file.
with open(nginx_conf_fn, "w") as f: with open(nginx_conf_fn, "w") as f:
f.write(nginx_conf) f.write(conf)
# Kick nginx. Since this might be called from the web admin kick = True
# don't do a 'restart'. That would kill the connection before if kick:
# the API returns its response. A 'reload' should be good # Kick nginx. Since this might be called from the web admin
# enough and doesn't break any open connections. # don't do a 'restart'. That would kill the connection before
shell('check_call', ["/usr/sbin/service", "nginx", "reload"]) # the API returns its response. A 'reload' should be good
# enough and doesn't break any open connections.
shell('check_call', ["/usr/sbin/service", "nginx", "reload"])
return "web updated\n" return "web updated\n"
return ""
def make_domain_config(domain, templates, ssl_certificates, env): def make_domain_config(domain, templates, ssl_certificates, env):
# GET SOME VARIABLES # GET SOME VARIABLES