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

[mod] pep8

Browse source
This commit is contained in:
Laurent Peuch 2016-11-09 08:38:58 +01:00
parent 937cccf813
commit 9e5b2743db
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/yunohost/certificate.py
View file

@ -108,7 +108,7 @@ def certificate_status(auth, domain_list, full=False):
del status["domain"] del status["domain"]
certificates[domain] = status certificates[domain] = status
return { "certificates" : certificates } return {"certificates" : certificates}
def certificate_install(auth, domain_list, force=False, no_checks=False, self_signed=False): def certificate_install(auth, domain_list, force=False, no_checks=False, self_signed=False):
@ -325,9 +325,9 @@ def certificate_renew(auth, domain_list, force=False, no_checks=False, email=Fal
############################################################################### ###############################################################################
def _check_old_letsencrypt_app(): def _check_old_letsencrypt_app():
installedAppIds = [app["id"] for app in yunohost.app.app_list(installed=True)["apps"]]
installedAppIds = [ app["id"] for app in yunohost.app.app_list(installed=True)["apps"] ] if "letsencrypt" not in installedAppIds:
if ("letsencrypt" not in installedAppIds) :
return return
logger.warning(" ") logger.warning(" ")
@ -347,6 +347,7 @@ def _check_old_letsencrypt_app():
raise MoulinetteError(errno.EINVAL, m18n.n('certmanager_old_letsencrypt_app_detected')) raise MoulinetteError(errno.EINVAL, m18n.n('certmanager_old_letsencrypt_app_detected'))
def _install_cron(): def _install_cron():
cron_job_file = "/etc/cron.weekly/yunohost-certificate-renew" cron_job_file = "/etc/cron.weekly/yunohost-certificate-renew"
@ -679,9 +680,9 @@ def _dns_ip_match_public_ip(public_ip, domain):
try: try:
resolver = dns.resolver.Resolver() resolver = dns.resolver.Resolver()
# These are FDN's DNS # These are FDN's DNS
resolver.nameservers = [ "80.67.169.12", "80.67.169.40" ] resolver.nameservers = ["80.67.169.12", "80.67.169.40"]
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))
dns_ip = str(answers[0]) dns_ip = str(answers[0])
@ -693,7 +694,7 @@ def _domain_is_accessible_through_HTTP(ip, domain):
try: try:
r = requests.head("http://" + ip, headers={"Host": domain}) r = requests.head("http://" + ip, headers={"Host": domain})
# Check we got the ssowat header in the response # Check we got the ssowat header in the response
if ("x-sso-wat" not in r.headers.keys()) : if "x-sso-wat" not in r.headers.keys():
return False return False
except Exception: except Exception:
return False return False