From 449a538e6bd4228ec20d98115a91ea9309eb6824 Mon Sep 17 00:00:00 2001 From: Joshua Tauberer Date: Tue, 17 Feb 2015 00:44:30 +0000 Subject: [PATCH] if a CNAME is set for a domain, don't create a website for that domain (just like A/AAAA records) --- CHANGELOG.md | 1 + management/web_update.py | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 52a16ea8..902c3379 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,6 +24,7 @@ Web: * The nginx server no longer reports its version and OS for better privacy. * The HTTP->HTTPS redirect is now more efficient. * When serving a 'www.' domain, reuse the SSL certificate for the parent domain if it covers the 'www' subdomain too +* If a custom DNS CNAME record is set on a domain, don't offer to put a website on that domain. (Same logic already applies to custom A/AAAA records.) Control panel: diff --git a/management/web_update.py b/management/web_update.py index 98fa8abf..b088c55f 100644 --- a/management/web_update.py +++ b/management/web_update.py @@ -27,6 +27,7 @@ def get_web_domains(env): for domain, value in dns.items(): if domain not in domains: continue if (isinstance(value, str) and (value != "local")) \ + or (isinstance(value, dict) and ("CNAME" in value)) \ or (isinstance(value, dict) and ("A" in value) and (value["A"] != "local")) \ or (isinstance(value, dict) and ("AAAA" in value) and (value["AAAA"] != "local")): domains.remove(domain)