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] ip6.yunohost is now served through HTTPS.

Browse source
This commit is contained in:
opi 2017-03-22 08:31:47 +01:00
parent d00ed6cacf
commit ce472696f5
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data/hooks/conf_regen/43-dnsmasq
View file

@ -17,7 +17,7 @@ do_pre_regen() {
# retrieve variables # retrieve variables
ipv4=$(curl -s -4 https://ip.yunohost.org 2>/dev/null || true) ipv4=$(curl -s -4 https://ip.yunohost.org 2>/dev/null || true)
ynh_validate_ip4 "$ipv4" || ipv4='127.0.0.1' 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='' ynh_validate_ip6 "$ipv6" || ipv6=''
domain_list=$(sudo yunohost domain list --output-as plain --quiet) domain_list=$(sudo yunohost domain list --output-as plain --quiet)

3
src/yunohost/domain.py
View file

@ -280,8 +280,7 @@ def get_public_ip(protocol=4):
if protocol == 4: if protocol == 4:
url = 'https://ip.yunohost.org' url = 'https://ip.yunohost.org'
elif protocol == 6: elif protocol == 6:
# FIXME: Let's Encrypt does not support IPv6-only hosts yet url = 'https://ip6.yunohost.org'
url = 'http://ip6.yunohost.org'
else: else:
raise ValueError("invalid protocol version") raise ValueError("invalid protocol version")
try: try: