From b3881641477aeb24db0d901b341b80c1457883bf Mon Sep 17 00:00:00 2001
From: Theodoros Grammenos <teogramm@outlook.com>
Date: Sat, 18 Feb 2023 13:14:43 +0200
Subject: [PATCH] Fix Zebra server not starting

---
 config-main.env                                           | 3 ++-
 .../etc/s6-overlay/s6-rc.d/user/contents.d/zebra-indexer  | 0
 files/etc/s6-overlay/s6-rc.d/user/contents.d/zebra-server | 0
 files/etc/s6-overlay/s6-rc.d/worker/run                   | 1 -
 files/etc/s6-overlay/s6-rc.d/zebra-indexer/run            | 6 ++++++
 files/etc/s6-overlay/s6-rc.d/zebra-server/run             | 8 ++++++++
 files/etc/s6-overlay/scripts/02-setup-koha.sh             | 8 ++------
 7 files changed, 18 insertions(+), 8 deletions(-)
 create mode 100644 files/etc/s6-overlay/s6-rc.d/user/contents.d/zebra-indexer
 create mode 100644 files/etc/s6-overlay/s6-rc.d/user/contents.d/zebra-server

diff --git a/config-main.env b/config-main.env
index 7610034..fe72ae4 100644
--- a/config-main.env
+++ b/config-main.env
@@ -20,10 +20,11 @@ KOHA_LANGS=
 ZEBRA_MARC_FORMAT=marc21
 
 # Elasticsearch options
-# If the ELASTICSEARCH_HOST variable is set the
+# If the USE_ELASTICSEARCH variable is set the
 # container is set yp to use Elasticsearch. A
 # Zebra server is spawned inside the container,
 # otherwise.
+#USE_ELASTICSEARCH=true
 #ELASTICSEARCH_HOST=
 #OVERRIDE_SYSPREF_SearchEngine=Elasticsearch
 
diff --git a/files/etc/s6-overlay/s6-rc.d/user/contents.d/zebra-indexer b/files/etc/s6-overlay/s6-rc.d/user/contents.d/zebra-indexer
new file mode 100644
index 0000000..e69de29
diff --git a/files/etc/s6-overlay/s6-rc.d/user/contents.d/zebra-server b/files/etc/s6-overlay/s6-rc.d/user/contents.d/zebra-server
new file mode 100644
index 0000000..e69de29
diff --git a/files/etc/s6-overlay/s6-rc.d/worker/run b/files/etc/s6-overlay/s6-rc.d/worker/run
index 6876e76..2a4b85c 100755
--- a/files/etc/s6-overlay/s6-rc.d/worker/run
+++ b/files/etc/s6-overlay/s6-rc.d/worker/run
@@ -1,5 +1,4 @@
 #!/command/execlineb -P
-with-contenv
 
 fdmove -c 2 1
 
diff --git a/files/etc/s6-overlay/s6-rc.d/zebra-indexer/run b/files/etc/s6-overlay/s6-rc.d/zebra-indexer/run
index e5df9dc..40543dd 100755
--- a/files/etc/s6-overlay/s6-rc.d/zebra-indexer/run
+++ b/files/etc/s6-overlay/s6-rc.d/zebra-indexer/run
@@ -1,4 +1,10 @@
 #!/command/execlineb -P
+with-contenv
+
+importas -D "" elastic USE_ELASTICSEARCH
+
+if -n { test "${elastic}" = "true" }
+
 fdmove -c 2 1
 
 s6-envdir /etc/koha-envvars
diff --git a/files/etc/s6-overlay/s6-rc.d/zebra-server/run b/files/etc/s6-overlay/s6-rc.d/zebra-server/run
index 1430ee2..2798235 100755
--- a/files/etc/s6-overlay/s6-rc.d/zebra-server/run
+++ b/files/etc/s6-overlay/s6-rc.d/zebra-server/run
@@ -1,6 +1,14 @@
 #!/command/execlineb -P
+with-contenv
+
+importas -D "" elastic USE_ELASTICSEARCH
+
+if -n { test "${elastic}" = "true" }
+
 fdmove -c 2 1
 
+s6-envdir /etc/koha-envvars
+
 s6-setuidgid default-koha
 
 /usr/bin/zebrasrv -v 1 -f /etc/koha/sites/default/koha-conf.xml
diff --git a/files/etc/s6-overlay/scripts/02-setup-koha.sh b/files/etc/s6-overlay/scripts/02-setup-koha.sh
index 674b336..953bd2d 100755
--- a/files/etc/s6-overlay/scripts/02-setup-koha.sh
+++ b/files/etc/s6-overlay/scripts/02-setup-koha.sh
@@ -30,7 +30,7 @@ MB_PARAMS="--mb-host ${MB_HOST} --mb-port ${MB_PORT} --mb-user ${MB_USER} --mb-p
 
 # Configure the elasticsearch server
 ES_PARAMS=""
-if [[ "${ELASTICSEARCH_HOST}" != "" ]]
+if [[ "${USE_ELASTICSEARCH}" = "true" ]]
 then
     ES_PARAMS="--elasticsearch-server ${ELASTICSEARCH_HOST}"
 fi
@@ -45,12 +45,8 @@ else
 fi
 
 # Configure search daemon
-if [ "${USE_ELASTICSEARCH}" != "true" ]
+if [ "${USE_ELASTICSEARCH}" = "true" ]
 then
-    # Start zebra services with s6
-    touch /etc/s6-overlay/s6-rc.d/user/contents.d/zebra-indexer
-    touch /etc/s6-overlay/s6-rc.d/user/contents.d/zebra-server
-else
     koha-elasticsearch --rebuild -p $(grep -c ^processor /proc/cpuinfo) ${KOHA_INSTANCE} &
 fi