From 6caebc2e15a5e1200283acd87c08f392dda6fd34 Mon Sep 17 00:00:00 2001
From: "p.delpy@dkfz-heidelberg.de" <p.delpy@dkfz-heidelberg.de>
Date: Tue, 14 Feb 2023 10:20:19 +0100
Subject: [PATCH] beautiful config

---
 ccp/modules/exporter-setup.sh  | 14 ++++++--------
 ccp/modules/teiler-ui-setup.sh | 12 +++++-------
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/ccp/modules/exporter-setup.sh b/ccp/modules/exporter-setup.sh
index 090d23c..044116b 100644
--- a/ccp/modules/exporter-setup.sh
+++ b/ccp/modules/exporter-setup.sh
@@ -1,10 +1,8 @@
 #!/bin/bash
 
-function exporterSetup() {
-	if [ -n "$ENABLE_EXPORTER" ];then
-		log INFO "Exporter setup detected -- will start Exporter service."
-		OVERRIDE+=" -f ./$PROJECT/modules/exporter-compose.yml"
-	fi
-	# TODO: Generate password in another way so that not all passwords are the same?
-	EXPORTER_DB_PASSWORD="$(echo \"This is a salt string to generate one consistent password. It is not required to be secret.\" | openssl rsautl -sign -inkey /etc/bridgehead/pki/${SITE_ID}.priv.pem | base64 | head -c 30)"
-}
+if [ -n "$ENABLE_EXPORTER" ];then
+  log INFO "Exporter setup detected -- will start Exporter service."
+  OVERRIDE+=" -f ./$PROJECT/modules/exporter-compose.yml"
+fi
+# TODO: Generate password in another way so that not all passwords are the same?
+EXPORTER_DB_PASSWORD="$(echo \"This is a salt string to generate one consistent password. It is not required to be secret.\" | openssl rsautl -sign -inkey /etc/bridgehead/pki/${SITE_ID}.priv.pem | base64 | head -c 30)"
diff --git a/ccp/modules/teiler-ui-setup.sh b/ccp/modules/teiler-ui-setup.sh
index 1ff6f3b..dc755ba 100644
--- a/ccp/modules/teiler-ui-setup.sh
+++ b/ccp/modules/teiler-ui-setup.sh
@@ -1,9 +1,7 @@
 #!/bin/bash
 
-function teilerUiSetup() {
-	if [ -n "$ENABLE_TEILER" ];then
-		log INFO "Teiler-UI setup detected -- will start Teiler-UI services."
-		OVERRIDE+=" -f ./$PROJECT/modules/teiler-ui-compose.yml"
-	fi
-	KEYCLOAK_DB_PASSWORD="$(echo \"This is a salt string to generate one consistent password. It is not required to be secret.\" | openssl rsautl -sign -inkey /etc/bridgehead/pki/${SITE_ID}.priv.pem | base64 | head -c 30)"
-}
+if [ "$ENABLE_TEILER" == true ];then
+  log INFO "Teiler-UI setup detected -- will start Teiler-UI services."
+  OVERRIDE+=" -f ./$PROJECT/modules/teiler-ui-compose.yml"
+fi
+KEYCLOAK_DB_PASSWORD="$(echo \"This is a salt string to generate one consistent password. It is not required to be secret.\" | openssl rsautl -sign -inkey /etc/bridgehead/pki/${SITE_ID}.priv.pem | base64 | head -c 30)"