external/mailinabox
1
0
Fork 0
mirror of https://github.com/mail-in-a-box/mailinabox.git synced 2025-04-04 00:17:06 +00:00
Code Issues Releases Wiki Activity

A more reliable way to detect the top domain.

Browse Source
This commit is contained in:
Steve Hay 2022-09-23 10:09:27 -04:00
parent cd8a1caa8b
commit 289152c383
No known key found for this signature in database
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
management/web_update.py
View File

@ -125,6 +125,8 @@ def do_web_update(env):
def make_domain_config(domain, templates, ssl_certificates, env): def make_domain_config(domain, templates, ssl_certificates, env):
# GET SOME VARIABLES # GET SOME VARIABLES
mail_domains = set()
mail_domains |= get_mail_domains(env)
# Where will its root directory be for static files? # Where will its root directory be for static files?
root = get_web_root(domain, env) root = get_web_root(domain, env)
@ -136,8 +138,8 @@ def make_domain_config(domain, templates, ssl_certificates, env):
nginx_conf_extra = "" nginx_conf_extra = ""
# Add .well-known redirects for CalDAV and CardDAV to TLD, which may make for better service discovery # Add .well-known redirects for CalDAV and CardDAV to mail domains, which may make for better service discovery
if len(domain.count('.'))==1: # something.tld if domain in mail_domains: # something.tld
nginx_conf_extra += f"\n\trewrite ^/.well-known/caldav https://{env['PRIMARY_HOSTNAME']}/cloud/remote.php/dav/ redirect;" nginx_conf_extra += f"\n\trewrite ^/.well-known/caldav https://{env['PRIMARY_HOSTNAME']}/cloud/remote.php/dav/ redirect;"
nginx_conf_extra += f"\n\trewrite ^/.well-known/carddav https://{env['PRIMARY_HOSTNAME']}/cloud/remote.php/dav/ redirect;\n" nginx_conf_extra += f"\n\trewrite ^/.well-known/carddav https://{env['PRIMARY_HOSTNAME']}/cloud/remote.php/dav/ redirect;\n"
nginx_conf_extra += f"\n\tlocation /dav {{" nginx_conf_extra += f"\n\tlocation /dav {{"