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

[enh] Attempt to improve readability of domain_dns_conf

Browse source
This commit is contained in:
Jérôme Lebleu 2016-02-28 21:43:33 +01:00
parent a557956a47
commit 36981ac21d
1 changed files with 35 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
src/yunohost/domain.py
View file

@ -225,33 +225,49 @@ def domain_dns_conf(domain, ttl=None):
Keyword argument: Keyword argument:
domain -- Domain name domain -- Domain name
ttl -- Time to live ttl -- Time to live
""" """
ttl = 3600 if ttl is None else ttl ttl = 3600 if ttl is None else ttl
ip4 = ip6 = None
ip4 = urlopen("http://ip.yunohost.org").read().strip() # A/AAAA records
try:
result = "@ {ttl} IN A {ip4}\n* {ttl} IN A {ip4}\n".format(ttl=ttl, ip4=ip4) ip4 = urlopen("http://ip.yunohost.org").read().strip()
except IOError:
ip6 = None raise MoulinetteError(errno.ENETUNREACH,
m18n.n('no_internet_connection'))
result = (
"@ {ttl} IN A {ip4}\n"
"* {ttl} IN A {ip4}\n"
).format(ttl=ttl, ip4=ip4)
try: try:
ip6 = urlopen("http://ip6.yunohost.org").read().strip() ip6 = urlopen("http://ip6.yunohost.org").read().strip()
except Exception: except IOError:
pass logger.debug('cannot retrieve IPv6', exc_info=1)
else: else:
result += "@ {ttl} IN AAAA {ip6}\n* {ttl} IN AAAA {ip6}\n".format(ttl=ttl, ip6=ip6) result += (
"@ {ttl} IN AAAA {ip6}\n"
"* {ttl} IN AAAA {ip6}\n"
).format(ttl=ttl, ip6=ip6)
result += "\n_xmpp-client._tcp {ttl} IN SRV 0 5 5222 {domain}.\n_xmpp-server._tcp {ttl} IN SRV 0 5 5269 {domain}.\n".format(ttl=ttl, domain=domain) # Jabber/XMPP
result += ("\n"
"_xmpp-client._tcp {ttl} IN SRV 0 5 5222 {domain}.\n"
"_xmpp-server._tcp {ttl} IN SRV 0 5 5269 {domain}.\n"
"muc {ttl} IN CNAME @\n"
"pubsub {ttl} IN CNAME @\n"
"vjud {ttl} IN CNAME @\n"
).format(ttl=ttl, domain=domain)
result += "muc {ttl} IN CNAME @\npubsub {ttl} IN CNAME @\nvjud {ttl} IN CNAME @\n\n".format(ttl=ttl) # Email
result += ('\n'
result += "@ {ttl} IN MX 10 {domain}.\n".format(ttl=ttl, domain=domain) '@ {ttl} IN MX 10 {domain}.\n'
'@ {ttl} IN TXT "v=spf1 a mx ip4:{ip4}'
if ip6 is None: ).format(ttl=ttl, domain=domain, ip4=ip4)
result += '@ {ttl} IN TXT "v=spf1 a mx ip4:{ip4} -all"\n'.format(ttl=ttl, ip4=ip4) if ip6 is not None:
else: result += ' ip6:{ip6}'.format(ip6=ip6)
result += '@ {ttl} IN TXT "v=spf1 a mx ip4:{ip4} ip6:{ip6} -all"\n'.format(ttl=ttl, ip4=ip4, ip6=ip6) result += ' -all"'
try: try:
with open('/etc/dkim/{domain}.mail.txt'.format(domain=domain)) as f: with open('/etc/dkim/{domain}.mail.txt'.format(domain=domain)) as f:
@ -266,7 +282,7 @@ def domain_dns_conf(domain, ttl=None):
'(?=.*(;[\s]*|")p=(?P<p>[^";]+))'), dkim_content, re.M|re.S '(?=.*(;[\s]*|")p=(?P<p>[^";]+))'), dkim_content, re.M|re.S
) )
if dkim: if dkim:
result += '{host} {ttl} IN TXT "v={v}; k={k}; p={p}"'.format( result += '\n{host} {ttl} IN TXT "v={v}; k={k}; p={p}"'.format(
host='{0}.{1}'.format(dkim.group('host'), domain), ttl=ttl, host='{0}.{1}'.format(dkim.group('host'), domain), ttl=ttl,
v=dkim.group('v'), k=dkim.group('k'), p=dkim.group('p') v=dkim.group('v'), k=dkim.group('k'), p=dkim.group('p')
) )