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

Misc cleanup

Browse source
This commit is contained in:
Alexandre Aubin 2021-08-28 18:11:04 +02:00
parent 13f2cabc46
commit 9f4ca2e819
1 changed files with 8 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/yunohost/domain.py
View file

@ -750,25 +750,21 @@ def _load_domain_settings(domains=[]):
""" """
# Retrieve actual domain list # Retrieve actual domain list
get_domain_list = domain_list() get_domain_list = domain_list()
all_known_domains = get_domain_list["domains"]
maindomain = get_domain_list["main"]
if domains: if domains:
# check existence of requested domains
all_known_domains = get_domain_list["domains"]
# filter inexisting domains # filter inexisting domains
unknown_domains = filter(lambda domain : not domain in all_known_domains, domains) unknown_domains = filter(lambda domain: domain not in all_known_domains, domains)
# get first unknown domain # get first unknown domain
unknown_domain = next(unknown_domains, None) unknown_domain = next(unknown_domains, None)
if unknown_domain != None: if unknown_domain is None:
raise YunohostValidationError("domain_name_unknown", domain=unknown_domain) raise YunohostValidationError("domain_name_unknown", domain=unknown_domain)
else: else:
domains = get_domain_list["domains"] domains = all_known_domains
# Create sanitized data # Create sanitized data
new_domains = dict() out = dict()
# Load main domain
maindomain = get_domain_list["main"]
for domain in domains: for domain in domains:
# Retrieve entries in the YAML # Retrieve entries in the YAML
@ -789,9 +785,9 @@ def _load_domain_settings(domains=[]):
# Update each setting if not present # Update each setting if not present
default_settings.update(on_disk_settings) default_settings.update(on_disk_settings)
# Add the domain to the list # Add the domain to the list
new_domains[domain] = default_settings out[domain] = default_settings
return new_domains return out
def _load_registrar_setting(dns_zone): def _load_registrar_setting(dns_zone):