PG* DB env preparation

Author: brontolosone

files/service/env.d/000_DB-env-defaults

@@ -0,0 +1,17 @@
+# handle legacy DB_SSL configuration, as we couldn't conditionally template that in docker-compose.yml
+if [[ -v DB_SSL && "${DB_SSL}" = "true" ]]; then
+  if [[ -v PGSSLMODE && -v PGREQUIRESSL ]]; then
+    export PGSSLMODE="require"
+  else
+    echo "Fatal: legacy 'DB_SSL=true' specified, but PGSSLMODE or PGREQUIRESSL has already been set. To resolve ambiguity, remove 'DB_SSL=true' from your .env file." > /dev/stderr
+    exit 100
+  fi
+fi
+
+# handle other legacy DB_* configuration, and fill in our defaults if nothing is specified
+# When these PG* variables are _defined_ (even if _empty_), they will be left as-is.
+[[ -v PGHOST ]] || export PGHOST=${DB_HOST:-postgres14}
+[[ -v PGUSER ]] || export PGUSER=${DB_USER:-odk}
+[[ -v PGPASSWORD ]] || export PGPASSWORD=${DB_PASSWORD:-odk}
+[[ -v PGDATABASE ]] || export PGDATABASE=${DB_NAME:-odk}
+[[ -v PGAPPNAME ]] || export PGAPPNAME=odkcentral

files/service/odk-cmd

@@ -2,4 +2,7 @@
 set -o pipefail
 shopt -s inherit_errexit
 
+# shellcheck disable=SC1090
+source /usr/share/odk/env.d/*
+
 exec "$(command -v node)" /usr/odk/lib/bin/cli.js "$@"

files/service/scripts/process-backlog.sh

@@ -2,5 +2,8 @@
 set -o pipefail
 shopt -s inherit_errexit
 
+# shellcheck disable=SC1090
+source /usr/share/odk/env.d/*
+
 cd /usr/odk
 /usr/local/bin/node lib/bin/process-backlog.js >/proc/1/fd/1 2>/proc/1/fd/2

files/service/scripts/purge.sh

@@ -2,5 +2,8 @@
 set -o pipefail
 shopt -s inherit_errexit
 
+# shellcheck disable=SC1090
+source /usr/share/odk/env.d/*
+
 cd /usr/odk
 /usr/local/bin/node lib/bin/purge.js >/proc/1/fd/1 2>/proc/1/fd/2

files/service/scripts/reap-sessions.sh

@@ -2,5 +2,8 @@
 set -o pipefail
 shopt -s inherit_errexit
 
+# shellcheck disable=SC1090
+source /usr/share/odk/env.d/*
+
 cd /usr/odk
 /usr/local/bin/node lib/bin/reap-sessions.js >/proc/1/fd/1 2>/proc/1/fd/2

files/service/scripts/run-analytics.sh

@@ -2,5 +2,8 @@
 set -o pipefail
 shopt -s inherit_errexit
 
+# shellcheck disable=SC1090
+source /usr/share/odk/env.d/*
+
 cd /usr/odk
 /usr/local/bin/node lib/bin/run-analytics.js >/proc/1/fd/1 2>/proc/1/fd/2

files/service/scripts/start-odk.sh

@@ -17,23 +17,8 @@ SENTRY_TAGS="{ \"version.central\": \"$(cat sentry-versions/central)\", \"versio
 # shellcheck disable=SC2090
 export SENTRY_TAGS
 
-# handle legacy DB_SSL configuration, as we couldn't conditionally template that in docker-compose.yml
-if [[ -v DB_SSL && "${DB_SSL}" = "true" ]]; then
-  if [[ -v PGSSLMODE && -v PGREQUIRESSL ]]; then
-    export PGSSLMODE="require"
-  else
-    echo "Fatal: legacy 'DB_SSL=true' specified, but PGSSLMODE or PGREQUIRESSL has already been set. To resolve ambiguity, remove 'DB_SSL=true' from your .env file." > /dev/stderr
-    exit 100
-  fi
-fi
-
-# handle other legacy DB_* configuration, and fill in our defaults if nothing is specified
-# When these PG* variables are _defined_ (even if _empty_), they will be left as-is.
-[[ -v PGHOST ]] || export PGHOST=${DB_HOST:-postgres14}
-[[ -v PGUSER ]] || export PGUSER=${DB_USER:-odk}
-[[ -v PGPASSWORD ]] || export PGPASSWORD=${DB_PASSWORD:-odk}
-[[ -v PGDATABASE ]] || export PGDATABASE=${DB_NAME:-odk}
-[[ -v PGAPPNAME ]] || export PGAPPNAME=odkcentral
+# shellcheck disable=SC1090
+source /usr/share/odk/env.d/*
 
 echo "waiting for PostgreSQL to become connectable to..."
 while ! (psql --no-password --quiet --command "" > /dev/null 2>&1 || (echo "sleeping 1 second waiting for a database connection"; false)); do sleep 1; done

files/service/scripts/upload-blobs.sh

@@ -2,5 +2,8 @@
 set -o pipefail
 shopt -s inherit_errexit
 
+# shellcheck disable=SC1090
+source /usr/share/odk/env.d/*
+
 cd /usr/odk
 /usr/local/bin/node lib/bin/s3.js upload-pending >/proc/1/fd/1 2>/proc/1/fd/2

service.dockerfile

@@ -60,6 +60,7 @@ COPY files/shared/envsub.awk /scripts/
 COPY files/service/scripts/ ./
 
 COPY files/service/config.json.template /usr/share/odk/
+COPY files/service/env.d/ /usr/share/odk/env.d/
 COPY files/service/crontab /etc/cron.d/odk
 COPY files/service/odk-cmd /usr/bin/