Add nngm and exliquid modules

ccp/modules/mtba-setup.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+function mtbaSetup() {
+	# TODO: Check if ID-Management Module is activated!
+	if [ -n "$ENABLE_MTBA" ];then
+		log INFO "MTBA setup detected -- will start MTBA Service and CBioPortal."
+		if [ ! -n "$IDMANAGER_UPLOAD_APIKEY" ]; then
+			log ERROR "Detected MTBA Module configuration but ID-Management Module seems not to be configured!"
+			exit 1;
+		fi
+		OVERRIDE+=" -f ./$PROJECT/mtba-compose.yml"
+	fi
+}

ccp/modules/nngm-setup.sh

@@ -7,15 +7,3 @@ function nngmSetup() {
 	fi
 	CONNECTOR_POSTGRES_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)"
 }
-
-function mtbaSetup() {
-	# TODO: Check if ID-Management Module is activated!
-	if [ -n "$ENABLE_MTBA" ];then
-		log INFO "MTBA setup detected -- will start MTBA Service and CBioPortal."
-		if [ ! -n "$IDMANAGER_UPLOAD_APIKEY" ]; then
-			log ERROR "Detected MTBA Module configuration but ID-Management Module seems not to be configured!"
-			exit 1;
-		fi
-		OVERRIDE+=" -f ./$PROJECT/mtba-compose.yml"
-	fi
-}

ccp/modules/teiler-setup.sh

@@ -1,3 +1,5 @@
+#!/bin/bash
+
 function teilerSetup() {
 	if [ -n "$ENABLE_TEILER" ];then
 		log INFO "Teiler setup detected -- will start Teiler service."

ccp/modules/teiler-ui-setup.sh

@@ -1,3 +1,5 @@
+#!/bin/bash
+
 function teilerUiSetup() {
 	if [ -n "$ENABLE_TEILER" ];then
 		log INFO "Teiler-UI setup detected -- will start Teiler-UI services."

ccp/vars

@@ -12,10 +12,11 @@ PRIVATEKEYFILENAME=/etc/bridgehead/pki/${SITE_ID}.priv.pem
 source $PROJECT/modules/id-management-setup.sh
 idManagementSetup
 # This will load nngm setup. Effective only if nngm configuration is defined.
-source $PROJECT/nngm-setup.sh
+source $PROJECT/modules/nngm-setup.sh
 nngmSetup
-source $PROJECT/exliquid-setup.sh
+source $PROJECT/modules/exliquid-setup.sh
 exliquidSetup
+source $PROJECT/modules/mtba-setup.sh
 mtbaSetup
 source $PROJECT/modules/teiler-setup.sh
 teilerSetup