YunoHost/moulinette
1
0
Fork 0
mirror of https://github.com/YunoHost/moulinette.git synced 2024-09-03 20:06:31 +02:00
Code Issues Projects Releases Packages Wiki Activity

[fix] Use http to retrieve public IPv6 due to Let's Encrypt restriction

Browse source
This commit is contained in:
Jérôme Lebleu 2016-03-08 16:57:21 +01:00
parent 5afd0c1272
commit c7a7e01d89
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/yunohost/domain.py
View file

@ -292,12 +292,15 @@ def domain_dns_conf(domain, ttl=None):
def get_public_ip(protocol=4): def get_public_ip(protocol=4):
"""Retrieve the public IP address from ip.yunohost.org""" """Retrieve the public IP address from ip.yunohost.org"""
if protocol not in [4, 6]: if protocol == 4:
url = 'https://ip.yunohost.org'
elif protocol == 6:
# FIXME: Let's Encrypt does not support IPv6 host only yet
url = 'http://ipv6.yunohost.org'
else:
raise ValueError("invalid protocol version") raise ValueError("invalid protocol version")
try: try:
return urlopen("https://ip{protocol}.yunohost.org".format( return urlopen(url).read().strip()
protocol=('' if protocol == 4 else 'v6')
)).read().strip()
except IOError: except IOError:
logger.debug('cannot retrieve public IPv%d' % protocol, exc_info=1) logger.debug('cannot retrieve public IPv%d' % protocol, exc_info=1)
raise MoulinetteError(errno.ENETUNREACH, raise MoulinetteError(errno.ENETUNREACH,