add REDIS_MAIN_* and REDIS_CACHE_* env vars

Co-authored-by: Tobias McNulty <tobiasmcnulty@users.noreply.github.com>
caktus · Jan 8, 2024 · 9f54d62 · 9f54d62
1 parent f3b1371
commit 9f54d62
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -126,6 +126,10 @@ services:
       - DOMAIN=${DOMAIN}
       - SUPPORT_EMAIL=${SYSADMIN_EMAIL}
       - HTTPS_PORT=${HTTPS_PORT:-443}
+      - REDIS_MAIN_HOST=enketo_redis_main
+      - REDIS_MAIN_PORT=6379
+      - REDIS_CACHE_HOST=enketo_redis_cache
+      - REDIS_CACHE_PORT=6380
   enketo_redis_main:
     image: redis:7.2
     volumes:

diff --git a/files/enketo/config.json.template b/files/enketo/config.json.template
@@ -23,12 +23,12 @@
     "query parameter to pass to submission": "st",
     "redis": {
         "main": {
-            "host": "enketo_redis_main",
-            "port": "6379"
+            "host": "${REDIS_MAIN_HOST}",
+            "port": "${REDIS_MAIN_PORT}"
         },
         "cache": {
-            "host": "enketo_redis_cache",
-            "port": "6380"
+            "host": "${REDIS_CACHE_HOST}",
+            "port": "${REDIS_CACHE_PORT}"
         }
     },
     "support": {

diff --git a/files/enketo/start-enketo.sh b/files/enketo/start-enketo.sh
@@ -7,7 +7,7 @@ BASE_URL=$( [ "${HTTPS_PORT}" = 443 ] && echo https://"${DOMAIN}" || echo https:
 SECRET=$(cat /etc/secrets/enketo-secret) \
 LESS_SECRET=$(cat /etc/secrets/enketo-less-secret) \
 API_KEY=$(cat /etc/secrets/enketo-api-key) \
-envsubst '$DOMAIN $BASE_URL $SECRET $LESS_SECRET $API_KEY $SUPPORT_EMAIL' \
+envsubst '$DOMAIN $BASE_URL $SECRET $LESS_SECRET $API_KEY $SUPPORT_EMAIL $REDIS_MAIN_HOST $REDIS_MAIN_PORT $REDIS_CACHE_HOST $REDIS_CACHE_PORT' \
     < "$CONFIG_PATH.template" \
     > "$CONFIG_PATH"