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

Get custom dns conf in _build_dns_conf

Browse source
This commit is contained in:
Josué Tille 2018-08-26 14:59:52 +02:00
parent 439a999c02
commit 5a27e314ff
1 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/yunohost/domain.py
View file

@ -38,6 +38,7 @@ import yunohost.certificate
from yunohost.service import service_regen_conf from yunohost.service import service_regen_conf
from yunohost.utils.network import get_public_ip from yunohost.utils.network import get_public_ip
from yunohost.log import is_unit_operation from yunohost.log import is_unit_operation
from yunohost.hook import hook_callback
logger = getActionLogger('yunohost.domain') logger = getActionLogger('yunohost.domain')
@ -188,7 +189,6 @@ def domain_dns_conf(domain, ttl=None):
ttl -- Time to live ttl -- Time to live
""" """
from yunohost.hook import hook_callback
ttl = 3600 if ttl is None else ttl ttl = 3600 if ttl is None else ttl
@ -212,8 +212,8 @@ def domain_dns_conf(domain, ttl=None):
result += "\n\n" result += "\n\n"
result += "; Custom\n" result += "; Custom\n"
for record in dns_conf["custom"]:
result += ''.join(hook_callback('custom_dns_rules', args=[])['stdreturn']) result += "\n{name} {ttl} IN {type} {value}".format(**record)
is_cli = True if msettings.get('interface') == 'cli' else False is_cli = True if msettings.get('interface') == 'cli' else False
if is_cli: if is_cli:
@ -393,12 +393,22 @@ def _build_dns_conf(domain, ttl=3600):
["_dmarc", ttl, "TXT", '"v=DMARC1; p=none"'], ["_dmarc", ttl, "TXT", '"v=DMARC1; p=none"'],
] ]
return { # Custom
hookres = hook_callback('custom_dns_rules', args=[domain])
print(hookres)
custom = []
for h in hookres.values() :
custom.extend(h['stdreturn'])
res = {
"basic": [{"name": name, "ttl": ttl, "type": type_, "value": value} for name, ttl, type_, value in basic], "basic": [{"name": name, "ttl": ttl, "type": type_, "value": value} for name, ttl, type_, value in basic],
"xmpp": [{"name": name, "ttl": ttl, "type": type_, "value": value} for name, ttl, type_, value in xmpp], "xmpp": [{"name": name, "ttl": ttl, "type": type_, "value": value} for name, ttl, type_, value in xmpp],
"mail": [{"name": name, "ttl": ttl, "type": type_, "value": value} for name, ttl, type_, value in mail], "mail": [{"name": name, "ttl": ttl, "type": type_, "value": value} for name, ttl, type_, value in mail],
"custom": custom,
} }
return res
def _get_DKIM(domain): def _get_DKIM(domain):
DKIM_file = '/etc/dkim/{domain}.mail.txt'.format(domain=domain) DKIM_file = '/etc/dkim/{domain}.mail.txt'.format(domain=domain)