WIP - initlestscrypt v2

kobotoolbox · Aug 16, 2023 · 175a9af · 175a9af
1 parent 466dd01
commit 175a9af
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git 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
@@ -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)