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

Fix result from hook_callback

Browse source
This commit is contained in:
Josué Tille 2019-02-11 20:22:42 +01:00
parent f266cceb26
commit d15092a740
No known key found for this signature in database
GPG key ID: D5E068C6DFA8681D
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/yunohost/domain.py
View file

@ -206,16 +206,16 @@ def domain_dns_conf(domain, ttl=None):
result += "; Mail"
for record in dns_conf["mail"]:
result += "\n{name} {ttl} IN {type} {value}".format(**record)
result += "\n\n
result += "\n\n"
result += "; Extra"
for record in dns_conf["extra"]:
result += "\n{name} {ttl} IN {type} {value}".format(**record)
for name, record_list in dns_conf.items():
if name not in ("basic", "xmpp", "mail"):
if name not in ("basic", "xmpp", "mail", "extra") and record_list:
result += "\n\n"
result += "; " + name + "\n"
result += "; " + name
for record in record_list:
result += "\n{name} {ttl} IN {type} {value}".format(**record)
@ -418,8 +418,10 @@ def _build_dns_conf(domain, ttl=3600):
# Custom record
hookres = hook_callback('custom_dns_rules', args=[domain])
for n,v in hookres.items() :
res[n] = v['stdreturn']
for n, val in hookres.items() :
res[n] = []
for v in [v['stdreturn'] for p, v in val.items() if v and v['stdreturn']]:
res[n].extend(v)
return res