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

dns: don't have empty sections in recommended conf

Browse source
This commit is contained in:
Alexandre Aubin 2021-09-19 16:50:57 +02:00
parent e3ce03ac85
commit d161d0744a
1 changed files with 19 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/yunohost/dns.py
View file

@ -61,21 +61,25 @@ def domain_dns_suggest(domain):
result = "" result = ""
if dns_conf["basic"]:
result += "; Basic ipv4/ipv6 records" result += "; Basic ipv4/ipv6 records"
for record in dns_conf["basic"]: for record in dns_conf["basic"]:
result += "\n{name} {ttl} IN {type} {value}".format(**record) result += "\n{name} {ttl} IN {type} {value}".format(**record)
result += "\n\n" if dns_conf["mail"]:
result += "; XMPP"
for record in dns_conf["xmpp"]:
result += "\n{name} {ttl} IN {type} {value}".format(**record)
result += "\n\n" result += "\n\n"
result += "; Mail" result += "; Mail"
for record in dns_conf["mail"]: for record in dns_conf["mail"]:
result += "\n{name} {ttl} IN {type} {value}".format(**record) result += "\n{name} {ttl} IN {type} {value}".format(**record)
result += "\n\n" result += "\n\n"
if dns_conf["xmpp"]:
result += "\n\n"
result += "; XMPP"
for record in dns_conf["xmpp"]:
result += "\n{name} {ttl} IN {type} {value}".format(**record)
if dns_conf["extra"]:
result += "; Extra" result += "; Extra"
for record in dns_conf["extra"]: for record in dns_conf["extra"]:
result += "\n{name} {ttl} IN {type} {value}".format(**record) result += "\n{name} {ttl} IN {type} {value}".format(**record)