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 warning to web_update.py if symbolic links are missing

Browse Source
This commit is contained in:
Justus Wingert 2023-08-14 16:38:10 +02:00 committed by GitHub
parent 5aa23e3420
commit a5a2c82d66
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
management/web_update.py
View File

@ -110,10 +110,16 @@ def do_web_update(env):
# Add default 'www.' redirect. # Add default 'www.' redirect.
nginx_conf.append((domain, make_domain_config(domain, [template0, template3], ssl_certificates, env))) nginx_conf.append((domain, make_domain_config(domain, [template0, template3], ssl_certificates, env)))
# Load the currently enabled sites for nginx.
sites_enabled = shell('check_output', ["ls", "/etc/nginx/sites-enabled"])
warnings = []
# Did the files change? If not, don't bother writing & restarting nginx. # Did the files change? If not, don't bother writing & restarting nginx.
kick = False kick = False
for domain, conf in nginx_conf: for domain, conf in nginx_conf:
nginx_conf_fn = "/etc/nginx/sites-available/%s" % domain if "miab_%s" % domain not in sites_enabled:
warnings.append("Missing miab_%s in /etc/nginx/sites-enabled/\nCheck your configuration!" % domain)
nginx_conf_fn = "/etc/nginx/sites-available/miab_%s" % domain
if os.path.exists(nginx_conf_fn): if os.path.exists(nginx_conf_fn):
with open(nginx_conf_fn) as f: with open(nginx_conf_fn) as f:
if f.read() == conf: if f.read() == conf:
@ -131,9 +137,9 @@ def do_web_update(env):
# enough and doesn't break any open connections. # enough and doesn't break any open connections.
shell('check_call', ["/usr/sbin/service", "nginx", "reload"]) shell('check_call', ["/usr/sbin/service", "nginx", "reload"])
return "web updated\n" return "web updated\n" + "\n".join(warnings)
return "" return "" + "\n".join(warnings)
def make_domain_config(domain, templates, ssl_certificates, env): def make_domain_config(domain, templates, ssl_certificates, env):
# GET SOME VARIABLES # GET SOME VARIABLES