From f0bdb5c1463541c0d070aef5324e955d06d9dc51 Mon Sep 17 00:00:00 2001
From: "p.delpy@dkfz-heidelberg.de" <p.delpy@dkfz-heidelberg.de>
Date: Thu, 12 Sep 2024 09:24:48 +0200
Subject: [PATCH] fix: re-add modules

---
 ccp/modules/id-management-setup.sh  | 2 +-
 ccp/modules/obds2fhir-rest-setup.sh | 2 +-
 dhki/vars                           | 9 +++++++++
 lib/update-bridgehead.sh            | 1 +
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/ccp/modules/id-management-setup.sh b/ccp/modules/id-management-setup.sh
index 3165956..333b512 100644
--- a/ccp/modules/id-management-setup.sh
+++ b/ccp/modules/id-management-setup.sh
@@ -3,7 +3,7 @@
 function idManagementSetup() {
 	if [ -n "$IDMANAGER_UPLOAD_APIKEY" ]; then
 		log INFO "id-management setup detected -- will start id-management (mainzelliste & magicpl)."
-		OVERRIDE+=" -f ./$PROJECT/modules/id-management-compose.yml"
+		OVERRIDE+=" -f ./ccp/modules/id-management-compose.yml"
 
 		# Auto Generate local Passwords
 		PATIENTLIST_POSTGRES_PASSWORD="$(echo \"id-management-module-db-password-salt\" | openssl pkeyutl -sign -inkey /etc/bridgehead/pki/${SITE_ID}.priv.pem | base64 | head -c 30)"
diff --git a/ccp/modules/obds2fhir-rest-setup.sh b/ccp/modules/obds2fhir-rest-setup.sh
index 677ea63..6120f31 100644
--- a/ccp/modules/obds2fhir-rest-setup.sh
+++ b/ccp/modules/obds2fhir-rest-setup.sh
@@ -7,7 +7,7 @@ function obds2fhirRestSetup() {
       log ERROR "Missing ID-Management Module! Fix this by setting up ID Management:"
       PATIENTLIST_URL=" "
     fi
-    OVERRIDE+=" -f ./$PROJECT/modules/obds2fhir-rest-compose.yml"
+    OVERRIDE+=" -f ./ccp/modules/obds2fhir-rest-compose.yml"
     LOCAL_SALT="$(echo \"local-random-salt\" | openssl pkeyutl -sign -inkey /etc/bridgehead/pki/${SITE_ID}.priv.pem | base64 | head -c 30)"
   fi
 }
diff --git a/dhki/vars b/dhki/vars
index 52f8961..df3dd55 100644
--- a/dhki/vars
+++ b/dhki/vars
@@ -9,3 +9,12 @@ PRIVATEKEYFILENAME=/etc/bridgehead/pki/${SITE_ID}.priv.pem
 BROKER_URL_FOR_PREREQ=$BROKER_URL
 
 POSTGRES_TAG=15.6-alpine
+
+for module in $PROJECT/modules/*.sh
+do
+    log DEBUG "sourcing $module"
+    source $module
+done
+
+idManagementSetup
+obds2fhirRestSetup
\ No newline at end of file
diff --git a/lib/update-bridgehead.sh b/lib/update-bridgehead.sh
index 44655b1..16638b6 100755
--- a/lib/update-bridgehead.sh
+++ b/lib/update-bridgehead.sh
@@ -10,6 +10,7 @@ if [ "$AUTO_HOUSEKEEPING" == "true" ]; then
 		docker system prune -a -f
 	else
 		A="$A Not cleaning docker images since BK is not running."
+		docker system prune -f
 	fi
 	hc_send log "$A"
 	log INFO "$A"