From 175a9af267cab421f1a52c67351011d5591a32df Mon Sep 17 00:00:00 2001 From: Olivier Leger Date: Wed, 16 Aug 2023 16:15:41 -0400 Subject: [PATCH] WIP - initlestscrypt v2 --- helpers/template.py | 7 +++++++ templates/nginx-certbot/init-letsencrypt.sh.tpl | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/helpers/template.py b/helpers/template.py index 84d91cc..8ccf622 100644 --- a/helpers/template.py +++ b/helpers/template.py @@ -317,6 +317,13 @@ def _get_value(property_, true_value='', false_value='#', if config.local_install else _get_value('service_account_whitelisted_hosts') ), + 'DOCKER_COMPOSE_CMD': _get_value( + 'compose_version', 'docker-compose', 'docker', 'v1' + ), + # Keep leading space in front of suffix if any + 'DOCKER_COMPOSE_SUFFIX': _get_value( + 'compose_version', '', ' compose', 'v1' + ) } @staticmethod diff --git a/templates/nginx-certbot/init-letsencrypt.sh.tpl b/templates/nginx-certbot/init-letsencrypt.sh.tpl index a05acb4..d71f83a 100644 --- a/templates/nginx-certbot/init-letsencrypt.sh.tpl +++ b/templates/nginx-certbot/init-letsencrypt.sh.tpl @@ -9,7 +9,7 @@ DATA_PATH="./data/certbot" EMAIL="" # Adding a valid address is strongly recommended STAGING=0 # Set to 1 if you're testing your setup to avoid hitting request limits MKDIR_CMD=$$(which mkdir) -DOCKER_COMPOSE_CMD=$$(which docker-compose) +DOCKER_COMPOSE_CMD="$$(which ${DOCKER_COMPOSE_CMD})${DOCKER_COMPOSE_SUFFIX}" CURL_CMD=$$(which curl)