From 30573d82d8c85daed61c973a9a2076bf4b8c2538 Mon Sep 17 00:00:00 2001
From: To-om <toom@thehive-project.org>
Date: Fri, 18 Sep 2020 07:17:07 +0200
Subject: [PATCH] #1548 #1519 Update docker entrypoint to include default
 configuration file and remove prevent cassandra wait if it is not configured

---
 package/docker/entrypoint | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/package/docker/entrypoint b/package/docker/entrypoint
index cdbf897d2a..cbf58c58ff 100755
--- a/package/docker/entrypoint
+++ b/package/docker/entrypoint
@@ -76,9 +76,7 @@ done
 
 if test "${CONFIG}" = 1
 then
-  echo "Waiting until Cassandra DB is up"
-  sleep 30   # Sleep until cassandra Db is up 
-  CONFIG_FILE=$(mktemp).conf
+  CONFIG_FILE=$(mktemp --tmpdir thehive-XXXXXX.conf)
   if test "${CONFIG_SECRET}" = 1
   then
     if test -z "${SECRET}"
@@ -106,18 +104,21 @@ then
       echo "storage.directory = \"${BDB_DIRECTORY}\"" >> ${CONFIG_FILE}
       echo "berkeleyje.freeDisk = 1"                  >> ${CONFIG_FILE}
     else
-      echo "Using cassanra address = ${CQL[@]}"
+      echo "Using cassandra address = ${CQL[@]}"
       echo "storage.backend = cql"            >> ${CONFIG_FILE}
-      if [[ -n $CQL_USERNAME && -n $CQL_PASSWORD ]];then
-           echo "storage.username = \"${CQL_USERNAME}\"" >> ${CONFIG_FILE}
-           echo "storage.password = \"${CQL_PASSWORD}\"" >> ${CONFIG_FILE}
-           printf "Using ${CQL_USERNAME} as cassandra username and ${CQL_PASSWORD} as its password\n"
+      if [[ -n $CQL_USERNAME && -n $CQL_PASSWORD ]]
+      then
+        echo "storage.username = \"${CQL_USERNAME}\"" >> ${CONFIG_FILE}
+        echo "storage.password = \"${CQL_PASSWORD}\"" >> ${CONFIG_FILE}
+        printf "Using ${CQL_USERNAME} as cassandra username and ${CQL_PASSWORD} as its password\n"
       fi
       echo "storage.cql.cluster-name = thp"   >> ${CONFIG_FILE}
       echo "storage.cql.keyspace = thehive"   >> ${CONFIG_FILE}
       echo "storage.hostname = ["             >> ${CONFIG_FILE}
       printf '%s\n' "${CQL_HOSTS[@]}"         >> ${CONFIG_FILE}
       echo "]"                                >> ${CONFIG_FILE}
+      echo "Waiting until Cassandra DB is up"
+      sleep 30   # Sleep until cassandra Db is up
     fi
     echo "}" >> ${CONFIG_FILE}
   fi
@@ -174,7 +175,7 @@ then
     fi
   fi
 
-  echo "include file(\"secret.conf\")" >> ${CONFIG_FILE}
+  echo "include file(\"/etc/thehive/application.conf\")" >> ${CONFIG_FILE}
 fi
 
 bin/thehive \