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] Correctly fetch IPv6

Browse source
This commit is contained in:
Kload 2014-05-18 11:57:21 +02:00
parent 1a6289d115
commit b11d2f450b
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
dyndns.py
View file

@ -104,7 +104,7 @@ def dyndns_update(dyn_host="dynhost.yunohost.org", domain=None, key=None, ip=Non
# IPv6 # IPv6
# TODO: Put global IPv6 in the DNS zone instead of ULA # TODO: Put global IPv6 in the DNS zone instead of ULA
ipv6 = None new_ipv6 = None
try: try:
with open('/etc/yunohost/ipv6') as f: with open('/etc/yunohost/ipv6') as f:
old_ipv6 = f.readline().rstrip() old_ipv6 = f.readline().rstrip()
@ -119,8 +119,7 @@ def dyndns_update(dyn_host="dynhost.yunohost.org", domain=None, key=None, ip=Non
with open('/etc/yunohost/ula') as f: with open('/etc/yunohost/ula') as f:
ula = f.readline().rstrip() ula = f.readline().rstrip()
# Get the IPv6 address given by radvd and sanitize it # Get the IPv6 address given by radvd and sanitize it
#with open('/proc/net/if_inet6') as f: with open('/proc/net/if_inet6') as f:
with open('/tmp/inet6') as f:
plain_ula = '' plain_ula = ''
for hextet in ula.split(':')[0:3]: for hextet in ula.split(':')[0:3]:
if len(hextet) < 4: if len(hextet) < 4:
@ -136,7 +135,7 @@ def dyndns_update(dyn_host="dynhost.yunohost.org", domain=None, key=None, ip=Non
except IOError: except IOError:
new_ipv6 = '0000:0000:0000:0000:0000:0000:0000:0000' new_ipv6 = '0000:0000:0000:0000:0000:0000:0000:0000'
if old_ip != new_ip or old_ipv6 != new_ipv6: if old_ip != new_ip or old_ipv6 != new_ipv6 and new_ipv6 is not None:
host = domain.split('.')[1:] host = domain.split('.')[1:]
host = '.'.join(host) host = '.'.join(host)
lines = [ lines = [
@ -152,6 +151,7 @@ def dyndns_update(dyn_host="dynhost.yunohost.org", domain=None, key=None, ip=Non
'update delete _xmpp-client._tcp.%s. SRV' % domain, 'update delete _xmpp-client._tcp.%s. SRV' % domain,
'update delete _xmpp-server._tcp.%s. SRV' % domain, 'update delete _xmpp-server._tcp.%s. SRV' % domain,
'update add %s. 1800 A %s' % (domain, new_ip), 'update add %s. 1800 A %s' % (domain, new_ip),
'update add %s. 1800 AAAA %s' % (domain, new_ipv6),
'update add %s. 14400 MX 5 %s.' % (domain, domain), 'update add %s. 14400 MX 5 %s.' % (domain, domain),
'update add %s. 14400 TXT "v=spf1 a mx -all"' % domain, 'update add %s. 14400 TXT "v=spf1 a mx -all"' % domain,
'update add pubsub.%s. 1800 A %s' % (domain, new_ip), 'update add pubsub.%s. 1800 A %s' % (domain, new_ip),