From 804560786243ccd4aecc0bef1b1ea12e4f8a5a4f Mon Sep 17 00:00:00 2001
From: Tobias Gesellchen <tobias@gesellix.de>
Date: Mon, 02 May 2022 08:25:18 +0000
Subject: [PATCH] Support to load plain ldif files during container setup (#223)

---
 opendj-packages/opendj-docker/run.sh |   46 +++++++++++++++++++++-------------------------
 1 files changed, 21 insertions(+), 25 deletions(-)

diff --git a/opendj-packages/opendj-docker/run.sh b/opendj-packages/opendj-docker/run.sh
index e93ae08..1130bf9 100755
--- a/opendj-packages/opendj-docker/run.sh
+++ b/opendj-packages/opendj-docker/run.sh
@@ -7,40 +7,36 @@
 # For Docker - mount a data volume on /opt/opendj/data
 # For Kubernetes mount a PV
 
-
 cd /opt/opendj
 
-#if defaul data folder exists do not change it
-if [ ! -d ./db ] ; then
-  echo "/opt/opendj/data" > /opt/opendj/instance.loc  && \
-    mkdir -p /opt/opendj/data/lib/extensions
+#if default data folder exists do not change it
+if [ ! -d ./db ]; then
+  echo "/opt/opendj/data" >/opt/opendj/instance.loc && \
+  mkdir -p /opt/opendj/data/lib/extensions
 fi
 
 # Instance dir does not exist? Then we need to run setup
-if [ ! -d ./data/config ] ; then
-
+if [ ! -d ./data/config ]; then
   echo "Instance data Directory is empty. Creating new DJ instance"
 
-  BOOTSTRAP=${BOOTSTRAP:-/opt/opendj/bootstrap/setup.sh}
-
   export BASE_DN=${BASE_DN:-"dc=example,dc=com"}
   echo "BASE DN is ${BASE_DN}"
 
   export PASSWORD=${ROOT_PASSWORD:-password}
+  echo "Password set to $PASSWORD"
 
-   echo "Password set to $PASSWORD"
+  BOOTSTRAP=${BOOTSTRAP:-/opt/opendj/bootstrap/setup.sh}
+  echo "Running $BOOTSTRAP"
+  sh "${BOOTSTRAP}"
 
-   echo "Running $BOOTSTRAP"
-   sh "${BOOTSTRAP}"
-
-   # Check if OPENDJ_REPLICATION_TYPE var is set. If it is - replicate to that server
-   if [ ! -z ${MASTER_SERVER} ] && [ ! -z ${OPENDJ_REPLICATION_TYPE} ];  then
-      /opt/opendj/bootstrap/replicate.sh
-   fi
+  # Check if OPENDJ_REPLICATION_TYPE var is set. If it is - replicate to that server
+  if [ ! -z ${MASTER_SERVER} ] && [ ! -z ${OPENDJ_REPLICATION_TYPE} ]; then
+    /opt/opendj/bootstrap/replicate.sh
+  fi
 else
- sh ./upgrade -n
- exec ./bin/start-ds --nodetach
- return
+  sh ./upgrade -n
+  exec ./bin/start-ds --nodetach
+  return
 fi
 
 # Check if keystores are mounted as a volume, and if so
@@ -50,16 +46,16 @@
 if [ -d "${SECRET_VOLUME}" ]; then
   echo "Secret volume is present. Will copy any keystores and truststore"
   # We send errors to /dev/null in case no data exists.
-  cp -f ${SECRET_VOLUME}/key*   ${SECRET_VOLUME}/trust* ./data/config 2>/dev/null
+  cp -f ${SECRET_VOLUME}/key* ${SECRET_VOLUME}/trust* ./data/config 2>/dev/null
 fi
 
 # todo: Check /opt/opendj/data/config/buildinfo
 # Run upgrade if the server is older
 
-if (bin/status -n | grep Started) ; then
-   echo "OpenDJ is started"
-   # We cant exit because we are pid 1
-   while true; do sleep 100000; done
+if (bin/status -n | grep Started); then
+  echo "OpenDJ is started"
+  # We cant exit because we are pid 1
+  while true; do sleep 100000; done
 fi
 
 echo "Try to upgrade OpenDJ"

--
Gitblit v1.10.0