From ce472696f52d6548b97491f56dcfe6599188ca2d Mon Sep 17 00:00:00 2001 From: opi Date: Wed, 22 Mar 2017 08:31:47 +0100 Subject: [PATCH] [enh] ip6.yunohost is now served through HTTPS. --- data/hooks/conf_regen/43-dnsmasq | 2 +- src/yunohost/domain.py | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/data/hooks/conf_regen/43-dnsmasq b/data/hooks/conf_regen/43-dnsmasq index 6947fb634..aab2b599f 100755 --- a/data/hooks/conf_regen/43-dnsmasq +++ b/data/hooks/conf_regen/43-dnsmasq @@ -17,7 +17,7 @@ do_pre_regen() { # retrieve variables ipv4=$(curl -s -4 https://ip.yunohost.org 2>/dev/null || true) ynh_validate_ip4 "$ipv4" || ipv4='127.0.0.1' - ipv6=$(curl -s -6 http://ip6.yunohost.org 2>/dev/null || true) + ipv6=$(curl -s -6 https://ip6.yunohost.org 2>/dev/null || true) ynh_validate_ip6 "$ipv6" || ipv6='' domain_list=$(sudo yunohost domain list --output-as plain --quiet) diff --git a/src/yunohost/domain.py b/src/yunohost/domain.py index ded8bb27a..37636229e 100644 --- a/src/yunohost/domain.py +++ b/src/yunohost/domain.py @@ -280,8 +280,7 @@ def get_public_ip(protocol=4): if protocol == 4: url = 'https://ip.yunohost.org' elif protocol == 6: - # FIXME: Let's Encrypt does not support IPv6-only hosts yet - url = 'http://ip6.yunohost.org' + url = 'https://ip6.yunohost.org' else: raise ValueError("invalid protocol version") try: