From 15ac64b05f425494356220da945e57c016e1e911 Mon Sep 17 00:00:00 2001 From: florian Date: Mon, 13 Jun 2022 19:55:15 +0200 Subject: [PATCH] let's encrypt - fix bug when AUTOCONF_MODE=yes --- core/letsencrypt/jobs/certbot-auth.py | 3 ++- core/letsencrypt/jobs/certbot-cleanup.py | 3 ++- core/letsencrypt/jobs/certbot-deploy.py | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/core/letsencrypt/jobs/certbot-auth.py b/core/letsencrypt/jobs/certbot-auth.py index 2685579..a9b0b38 100755 --- a/core/letsencrypt/jobs/certbot-auth.py +++ b/core/letsencrypt/jobs/certbot-auth.py @@ -15,11 +15,12 @@ try : # Get env vars is_kubernetes_mode = os.getenv("KUBERNETES_MODE") == "yes" is_swarm_mode = os.getenv("SWARM_MODE") == "yes" + is_autoconf_mode = os.getenv("AUTOCONF_MODE") == "yes" token = os.getenv("CERTBOT_TOKEN") validation = os.getenv("CERTBOT_VALIDATION") # Cluster case - if is_kubernetes_mode or is_swarm_mode : + if is_kubernetes_mode or is_swarm_mode or is_autoconf_mode : for variable, value in os.environ.items() : if not variable.startswith("CLUSTER_INSTANCE_") : continue diff --git a/core/letsencrypt/jobs/certbot-cleanup.py b/core/letsencrypt/jobs/certbot-cleanup.py index d2c5e7f..20e058c 100755 --- a/core/letsencrypt/jobs/certbot-cleanup.py +++ b/core/letsencrypt/jobs/certbot-cleanup.py @@ -15,10 +15,11 @@ try : # Get env vars is_kubernetes_mode = os.getenv("KUBERNETES_MODE") == "yes" is_swarm_mode = os.getenv("SWARM_MODE") == "yes" + is_autoconf_mode = os.getenv("AUTOCONF_MODE") == "yes" token = os.getenv("CERTBOT_TOKEN") # Cluster case - if is_kubernetes_mode or is_swarm_mode : + if is_kubernetes_mode or is_swarm_mode or is_autoconf_mode : for variable, value in os.environ.items() : if not variable.startswith("CLUSTER_INSTANCE_") : continue diff --git a/core/letsencrypt/jobs/certbot-deploy.py b/core/letsencrypt/jobs/certbot-deploy.py index 9452c4a..a65fe6a 100755 --- a/core/letsencrypt/jobs/certbot-deploy.py +++ b/core/letsencrypt/jobs/certbot-deploy.py @@ -17,10 +17,11 @@ try : # Get env vars is_kubernetes_mode = os.getenv("KUBERNETES_MODE") == "yes" is_swarm_mode = os.getenv("SWARM_MODE") == "yes" + is_autoconf_mode = os.getenv("AUTOCONF_MODE") == "yes" token = os.getenv("CERTBOT_TOKEN") # Cluster case - if is_kubernetes_mode or is_swarm_mode : + if is_kubernetes_mode or is_swarm_mode or is_autoconf_mode : # Create tarball of /data/letsencrypt tgz = BytesIO()