From 3caa48cda3eaa1e74b57dd2bec0298ded2bb14a6 Mon Sep 17 00:00:00 2001
From: TheSpad <git@spad.co.uk>
Date: Wed, 27 Dec 2023 17:02:31 +0000
Subject: [PATCH] Require DB_CONNECTION to be set

---
 jenkins-vars.yml                                   | 2 +-
 readme-vars.yml                                    | 2 +-
 root/etc/s6-overlay/s6-rc.d/init-lychee-config/run | 6 +++++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/jenkins-vars.yml b/jenkins-vars.yml
index 37f7452..46fd903 100644
--- a/jenkins-vars.yml
+++ b/jenkins-vars.yml
@@ -25,6 +25,6 @@ repo_vars:
   - CI_PORT='80'
   - CI_SSL='false'
   - CI_DELAY='120'
-  - CI_DOCKERENV='TZ=US/Pacific'
+  - CI_DOCKERENV='TZ=Europe/London|DB_CONNECTION=sqlite'
   - CI_AUTH='user:password'
   - CI_WEBPATH=''
diff --git a/readme-vars.yml b/readme-vars.yml
index e1d02c2..f540e37 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -26,7 +26,7 @@ param_ports:
   - { external_port: "80", internal_port: "80", port_desc: "http gui" }
 param_usage_include_env: true
 param_env_vars:
-  - { env_var: "DB_CONNECTION", env_value: "sqlite", desc: "DB type, from `sqlite`, `mysql`, `pqsql`." }
+  - { env_var: "DB_CONNECTION", env_value: "", desc: "DB type, from `sqlite`, `mysql`, `pqsql`." }
   - { env_var: "DB_HOST", env_value: "", desc: "DB server hostname. For `mysql` and `pgsql` only." }
   - { env_var: "DB_PORT", env_value: "", desc: "DB server port. For `mysql` and `pgsql` only." }
   - { env_var: "DB_USERNAME", env_value: "", desc: "DB user. For `mysql` and `pgsql` only." }
diff --git a/root/etc/s6-overlay/s6-rc.d/init-lychee-config/run b/root/etc/s6-overlay/s6-rc.d/init-lychee-config/run
index d8beff8..a34f236 100755
--- a/root/etc/s6-overlay/s6-rc.d/init-lychee-config/run
+++ b/root/etc/s6-overlay/s6-rc.d/init-lychee-config/run
@@ -34,7 +34,10 @@ ln -s /config/user.ini /etc/php82/conf.d/99-user.ini
 
 cd /app/www || exit 1
 
-if [[ "${DB_CONNECTION}" = "sqlite" ]] || [[ -z "${DB_CONNECTION}" ]]; then
+if [[ -z "${DB_CONNECTION}" ]]; then
+    echo "**** No DB_CONNECTION configured, halting init ****"
+    sleep infinity
+elif [[ "${DB_CONNECTION}" = "sqlite" ]]; then
     if [[ -n "${DB_DATABASE}" ]]; then
         if [[ ! -e "${DB_DATABASE}" ]]; then
             touch "${DB_DATABASE}"
@@ -43,6 +46,7 @@ if [[ "${DB_CONNECTION}" = "sqlite" ]] || [[ -z "${DB_CONNECTION}" ]]; then
         lsiown abc:abc "${DB_DATABASE}"
     else
         DB_DATABASE="/config/database.sqlite"
+        export DB_DATABASE
         printf "/config/database.sqlite" > /var/run/s6/container_environment/DB_DATABASE
     fi
 elif [[ "${DB_CONNECTION}" = "mysql" ]]; then