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

autodns: fix/simplify registrar settings fetching

Browse source
This commit is contained in:
Alexandre Aubin 2021-09-17 15:41:57 +02:00
parent d4d576c492
commit 93b99635b7
1 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/yunohost/dns.py
View file

@ -536,20 +536,17 @@ def domain_dns_push(operation_logger, domain, dry_run=False, force=False, purge=
_assert_domain_exists(domain) _assert_domain_exists(domain)
settings = domain_config_get(domain, key='dns.registrar') settings = domain_config_get(domain, key='dns.registrar', export=True)
registrar = settings["dns.registrar.registrar"].get("value") registrar = settings.get("registrar")
if not registrar or registrar in ["None", "yunohost"]: if not registrar or registrar in ["None", "yunohost"]:
raise YunohostValidationError("domain_dns_push_not_applicable", domain=domain) raise YunohostValidationError("domain_dns_push_not_applicable", domain=domain)
base_dns_zone = _get_dns_zone_for_domain(domain) base_dns_zone = _get_dns_zone_for_domain(domain)
registrar_credentials = { registrar_credentials = settings
k.split('.')[-1]: v["value"] registrar_credentials.pop("registrar")
for k, v in settings.items()
if k != "dns.registrar.registar"
}
if not all(registrar_credentials.values()): if not all(registrar_credentials.values()):
raise YunohostValidationError("domain_registrar_is_not_configured", domain=domain) raise YunohostValidationError("domain_registrar_is_not_configured", domain=domain)