beenull/power-mailinabox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

if a CNAME is set for a domain, don't create a website for that domain (just like A/AAAA records)

Browse source
This commit is contained in:
Joshua Tauberer 2015-02-17 00:44:30 +00:00
parent 3c50c9a18b
commit 449a538e6b
2 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -24,6 +24,7 @@ Web:
* The nginx server no longer reports its version and OS for better privacy. * The nginx server no longer reports its version and OS for better privacy.
* The HTTP->HTTPS redirect is now more efficient. * 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 * 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: Control panel:

1
management/web_update.py
View file

@ -27,6 +27,7 @@ def get_web_domains(env):
for domain, value in dns.items(): for domain, value in dns.items():
if domain not in domains: continue if domain not in domains: continue
if (isinstance(value, str) and (value != "local")) \ 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 ("A" in value) and (value["A"] != "local")) \
or (isinstance(value, dict) and ("AAAA" in value) and (value["AAAA"] != "local")): or (isinstance(value, dict) and ("AAAA" in value) and (value["AAAA"] != "local")):
domains.remove(domain) domains.remove(domain)