Makussu/bunkerweb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

let's encrypt - fix bug when AUTOCONF_MODE=yes

Browse Source
This commit is contained in:
florian 2022-06-13 19:55:15 +02:00
parent e0f8895e9a
commit 15ac64b05f
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/letsencrypt/jobs/certbot-auth.py
View File

@ -15,11 +15,12 @@ try :
# Get env vars # Get env vars
is_kubernetes_mode = os.getenv("KUBERNETES_MODE") == "yes" is_kubernetes_mode = os.getenv("KUBERNETES_MODE") == "yes"
is_swarm_mode = os.getenv("SWARM_MODE") == "yes" is_swarm_mode = os.getenv("SWARM_MODE") == "yes"
is_autoconf_mode = os.getenv("AUTOCONF_MODE") == "yes"
token = os.getenv("CERTBOT_TOKEN") token = os.getenv("CERTBOT_TOKEN")
validation = os.getenv("CERTBOT_VALIDATION") validation = os.getenv("CERTBOT_VALIDATION")
# Cluster case # 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() : for variable, value in os.environ.items() :
if not variable.startswith("CLUSTER_INSTANCE_") : if not variable.startswith("CLUSTER_INSTANCE_") :
continue continue

3
core/letsencrypt/jobs/certbot-cleanup.py
View File

@ -15,10 +15,11 @@ try :
# Get env vars # Get env vars
is_kubernetes_mode = os.getenv("KUBERNETES_MODE") == "yes" is_kubernetes_mode = os.getenv("KUBERNETES_MODE") == "yes"
is_swarm_mode = os.getenv("SWARM_MODE") == "yes" is_swarm_mode = os.getenv("SWARM_MODE") == "yes"
is_autoconf_mode = os.getenv("AUTOCONF_MODE") == "yes"
token = os.getenv("CERTBOT_TOKEN") token = os.getenv("CERTBOT_TOKEN")
# Cluster case # 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() : for variable, value in os.environ.items() :
if not variable.startswith("CLUSTER_INSTANCE_") : if not variable.startswith("CLUSTER_INSTANCE_") :
continue continue

3
core/letsencrypt/jobs/certbot-deploy.py
View File

@ -17,10 +17,11 @@ try :
# Get env vars # Get env vars
is_kubernetes_mode = os.getenv("KUBERNETES_MODE") == "yes" is_kubernetes_mode = os.getenv("KUBERNETES_MODE") == "yes"
is_swarm_mode = os.getenv("SWARM_MODE") == "yes" is_swarm_mode = os.getenv("SWARM_MODE") == "yes"
is_autoconf_mode = os.getenv("AUTOCONF_MODE") == "yes"
token = os.getenv("CERTBOT_TOKEN") token = os.getenv("CERTBOT_TOKEN")
# Cluster case # 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 # Create tarball of /data/letsencrypt
tgz = BytesIO() tgz = BytesIO()