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

Moving DNS resolvers IP to constant var at beginning of file

Browse source
This commit is contained in:
Alexandre Aubin 2016-11-22 20:38:33 -05:00
parent be061522e6
commit 0132cf037f
1 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/yunohost/certificate.py
View file

@ -67,6 +67,18 @@ CERTIFICATION_AUTHORITY = "https://acme-v01.api.letsencrypt.org"
INTERMEDIATE_CERTIFICATE_URL = "https://letsencrypt.org/certs/lets-encrypt-x3-cross-signed.pem" INTERMEDIATE_CERTIFICATE_URL = "https://letsencrypt.org/certs/lets-encrypt-x3-cross-signed.pem"
DNS_RESOLVERS = [
# FFDN DNS resolvers
# See https://www.ffdn.org/wiki/doku.php?id=formations:dns
"80.67.169.12", # FDN
"80.67.169.40", #
"89.234.141.66", # ARN
"141.255.128.100", # Aquilenet
"141.255.128.101", #
"89.234.186.18", # Grifon
"80.67.188.188" # LDN
]
############################################################################### ###############################################################################
# Front-end stuff # # Front-end stuff #
############################################################################### ###############################################################################
@ -695,16 +707,7 @@ def _check_domain_is_ready_for_ACME(domain):
def _dns_ip_match_public_ip(public_ip, domain): def _dns_ip_match_public_ip(public_ip, domain):
try: try:
resolver = dns.resolver.Resolver() resolver = dns.resolver.Resolver()
resolver.nameservers = [] resolver.nameservers = DNS_RESOLVERS
# FFDN DNS resolvers
# See https://www.ffdn.org/wiki/doku.php?id=formations:dns
resolver.nameservers.append("80.67.169.12") # FDN
resolver.nameservers.append("80.67.169.40") #
resolver.nameservers.append("89.234.141.66") # ARN
resolver.nameservers.append("141.255.128.100") # Aquilenet
resolver.nameservers.append("141.255.128.101") #
resolver.nameservers.append("89.234.186.18") # Grifon
resolver.nameservers.append("80.67.188.188") # LDN
answers = resolver.query(domain, "A") answers = resolver.query(domain, "A")
except (dns.resolver.NoAnswer, dns.resolver.NXDOMAIN): except (dns.resolver.NoAnswer, dns.resolver.NXDOMAIN):
raise MoulinetteError(errno.EINVAL, m18n.n('certmanager_error_no_A_record', domain=domain)) raise MoulinetteError(errno.EINVAL, m18n.n('certmanager_error_no_A_record', domain=domain))