badblocks/docker-easy-haproxy
1
0
Fork 0
Code Activity

Fix runtime errors

Browse source
This commit is contained in:
Joao Gilberto 2023-07-02 00:01:58 +00:00 • committed by Joao Gilberto Magalhaes
parent 3b2e9a43fd
commit 7f377e263f
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/functions/__init__.py
View file

@ -217,6 +217,8 @@ class Certbot:
@staticmethod @staticmethod
def set_acme_server(acme_server): def set_acme_server(acme_server):
if not acme_server:
return ""
if acme_server.lower() == "staging": if acme_server.lower() == "staging":
return "--staging" return "--staging"
elif acme_server.lower().startswith("http"): elif acme_server.lower().startswith("http"):
@ -254,7 +256,7 @@ class Certbot:
request_certs.append(host_arg) request_certs.append(host_arg)
else: else:
try: try:
with open(filename, 'r') as file: with open(filename, 'rb') as file:
certificate_str = file.read() certificate_str = file.read()
certificate = crypto.load_certificate(crypto.FILETYPE_PEM, certificate_str) certificate = crypto.load_certificate(crypto.FILETYPE_PEM, certificate_str)
expiration_after = datetime.strptime(certificate.get_notAfter().decode()[:-1], expiration_after = datetime.strptime(certificate.get_notAfter().decode()[:-1],
@ -264,7 +266,7 @@ class Certbot:
Functions.log(Functions.CERTBOT_LOG, Functions.DEBUG, Functions.log(Functions.CERTBOT_LOG, Functions.DEBUG,
"Request expired certificate for %s" % host) "Request expired certificate for %s" % host)
request_certs.append(host_arg) request_certs.append(host_arg)
if (expiration_after - current_time) // (24 * 3600) >= 15: if (expiration_after - current_time) // (24 * 3600) <= 15:
Functions.log(Functions.CERTBOT_LOG, Functions.DEBUG, "Renew certificate for %s" % host) Functions.log(Functions.CERTBOT_LOG, Functions.DEBUG, "Renew certificate for %s" % host)
renew_certs.append(host_arg) renew_certs.append(host_arg)
except Exception as e: except Exception as e: