From 289152c383c828d7ba2794334fff95afd049c7a4 Mon Sep 17 00:00:00 2001 From: Steve Hay Date: Fri, 23 Sep 2022 10:09:27 -0400 Subject: [PATCH] A more reliable way to detect the top domain. --- management/web_update.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/management/web_update.py b/management/web_update.py index 091bd068..82d601ba 100644 --- a/management/web_update.py +++ b/management/web_update.py @@ -125,6 +125,8 @@ def do_web_update(env): def make_domain_config(domain, templates, ssl_certificates, env): # GET SOME VARIABLES + mail_domains = set() + mail_domains |= get_mail_domains(env) # Where will its root directory be for static files? root = get_web_root(domain, env) @@ -136,8 +138,8 @@ def make_domain_config(domain, templates, ssl_certificates, env): nginx_conf_extra = "" - # Add .well-known redirects for CalDAV and CardDAV to TLD, which may make for better service discovery - if len(domain.count('.'))==1: # something.tld + # Add .well-known redirects for CalDAV and CardDAV to mail domains, which may make for better service discovery + 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/carddav https://{env['PRIMARY_HOSTNAME']}/cloud/remote.php/dav/ redirect;\n" nginx_conf_extra += f"\n\tlocation /dav {{"