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

Integration of domain settings loading/generation with domains DNS entries generation

Browse source
This commit is contained in:
Paco 2021-03-09 23:59:42 +01:00
parent 01fe61c15b
commit 8dd5859a46
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/yunohost/domain.py
View file

@ -288,7 +288,7 @@ def domain_dns_conf(domain):
if domain not in domain_list()["domains"]: if domain not in domain_list()["domains"]:
raise YunohostError("domain_name_unknown", domain=domain) raise YunohostError("domain_name_unknown", domain=domain)
domains_settings = _get_domain_and_subdomains_settings(domain) domains_settings = _get_domain_settings(domain, True)
dns_conf = _build_dns_conf(domains_settings) dns_conf = _build_dns_conf(domains_settings)
@ -464,7 +464,6 @@ def _build_dns_conf(domains):
for domain_name, domain in domains.items(): for domain_name, domain in domains.items():
print(domain_name)
ttl = domain["ttl"] ttl = domain["ttl"]
owned_dns_zone = "owned_dns_zone" in domains[root] and domains[root]["owned_dns_zone"] == True owned_dns_zone = "owned_dns_zone" in domains[root] and domains[root]["owned_dns_zone"] == True
@ -493,7 +492,7 @@ def _build_dns_conf(domains):
if domain["mail"] == True: if domain["mail"] == True:
mail += [ mail += [
[name, ttl, "MX", "10 %s." % domain], [name, ttl, "MX", "10 %s." % domain_name],
[name, ttl, "TXT", '"v=spf1 a mx -all"'], [name, ttl, "TXT", '"v=spf1 a mx -all"'],
] ]