YunoHost/yunohost
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost.git synced 2024-09-03 20:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

Semantics

Browse source
This commit is contained in:
Alexandre Aubin 2021-08-28 18:01:29 +02:00
parent 808a69ca64
commit 5f338d3c54
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/yunohost/domain.py
View file

@ -496,7 +496,7 @@ def _build_dns_conf(domain):
} }
""" """
domains = _get_domain_settings(domain, True) domains = _get_domain_settings(domain, include_subdomains=True)
basic = [] basic = []
mail = [] mail = []
@ -872,29 +872,29 @@ def _is_subdomain_of(subdomain, domain):
return True if re.search("(^|\\.)" + domain + "$", subdomain) else False return True if re.search("(^|\\.)" + domain + "$", subdomain) else False
def _get_domain_settings(domain, subdomains): def _get_domain_settings(domain, include_subdomains=False):
""" """
Get settings of a domain Get settings of a domain
Keyword arguments: Keyword arguments:
domain -- The domain name domain -- The domain name
subdomains -- Do we include the subdomains? Default is False include_subdomains -- Do we include the subdomains? Default is False
""" """
domains = _load_domain_settings() domains = _load_domain_settings()
if not domain in domains.keys(): if domain not in domains.keys():
raise YunohostError("domain_name_unknown", domain=domain) raise YunohostError("domain_name_unknown", domain=domain)
only_wanted_domains = dict() out = dict()
for entry in domains.keys(): for entry in domains.keys():
if subdomains: if include_subdomains:
if _is_subdomain_of(entry, domain): if _is_subdomain_of(entry, domain):
only_wanted_domains[entry] = domains[entry] out[entry] = domains[entry]
else: else:
if domain == entry: if domain == entry:
only_wanted_domains[entry] = domains[entry] out[entry] = domains[entry]
return only_wanted_domains return out
def _set_domain_settings(domain, domain_settings): def _set_domain_settings(domain, domain_settings):