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

Moar fikses

Browse source
This commit is contained in:
Alexandre Aubin 2021-08-28 21:49:35 +02:00
parent 951c6695b8
commit dded1cb775
2 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/yunohost/dns.py
View file

@ -95,6 +95,21 @@ def domain_dns_conf(domain):
return result
def _list_subdomains_of(parent_domain):
domain_list_ = domain_list()["domains"]
if parent_domain not in domain_list_:
raise YunohostError("domain_name_unknown", domain=domain)
out = []
for domain in domain_list_:
if domain.endswith(f".{parent_domain}"):
out.append(domain)
return out
def _build_dns_conf(base_domain):
"""
Internal function that will returns a data structure containing the needed
@ -163,7 +178,7 @@ def _build_dns_conf(base_domain):
# FIXME: shouldn't the basename just be based on the dns_zone setting of this domain ?
basename = domain.replace(f"{base_dns_zone}", "").rstrip(".") or "@"
suffix = f".{basename}" if base_name != "@" else ""
suffix = f".{basename}" if basename != "@" else ""
ttl = settings["ttl"]
@ -423,7 +438,7 @@ def domain_registrar_set(domain, registrar, args):
registrars = read_yaml(REGISTRAR_LIST_PATH)
if registrar not in registrars.keys():
raise YunohostValidationError("domain_registrar_unknown"i, registrar=registrar)
raise YunohostValidationError("domain_registrar_unknown", registrar=registrar)
parameters = registrars[registrar]
ask_args = []

15
src/yunohost/domain.py
View file

@ -476,21 +476,6 @@ def domain_setting(domain, key, value=None, delete=False):
_set_domain_settings(domain, domain_settings)
def _list_subdomains_of(parent_domain):
domain_list_ = domain_list()["domains"]
if parent_domain not in domain_list_:
raise YunohostError("domain_name_unknown", domain=domain)
out = []
for domain in domain_list_:
if domain.endswith(f".{parent_domain}"):
out.append(domain)
return out
def _set_domain_settings(domain, domain_settings):
"""
Set settings of a domain