From 8526b430dc568663997ff16ad006c9348ee40f0b Mon Sep 17 00:00:00 2001 From: "p.delpy@dkfz-heidelberg.de" Date: Mon, 9 Sep 2024 11:46:25 +0200 Subject: [PATCH] feat: add idmanagement and obds2fhir to dhki from ccp --- ccp/modules/id-management-setup.sh | 2 +- ccp/modules/obds2fhir-rest-setup.sh | 2 +- dhki/vars | 9 +++++++++ 3 files changed, 11 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..b728925 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 ccp/modules/*.sh +do + log DEBUG "sourcing $module" + source $module +done + +idManagementSetup +obds2fhirRestSetup \ No newline at end of file