fix bash logic

This commit is contained in:
p.delpy@dkfz-heidelberg.de 2023-10-24 07:41:17 +02:00
parent 262b9bd62e
commit 0555786435
3 changed files with 14 additions and 15 deletions

View File

@ -1,5 +1,6 @@
#!/bin/bash #!/bin/bash
function adt2fhirRestSetup() {
if [ -n "$ENABLE_ADT2FHIR_REST" ]; then if [ -n "$ENABLE_ADT2FHIR_REST" ]; then
log INFO "ADT2FHIR-REST setup detected -- will start adt2fhir-rest API." log INFO "ADT2FHIR-REST setup detected -- will start adt2fhir-rest API."
if [ ! -n "$IDMANAGER_LOCAL_PATIENTLIST_APIKEY" ]; then if [ ! -n "$IDMANAGER_LOCAL_PATIENTLIST_APIKEY" ]; then
@ -9,3 +10,4 @@ if [ -n "$ENABLE_ADT2FHIR_REST" ]; then
OVERRIDE+=" -f ./$PROJECT/modules/adt2fhir-rest-compose.yml" OVERRIDE+=" -f ./$PROJECT/modules/adt2fhir-rest-compose.yml"
LOCAL_SALT="$(echo \"local-random-salt\" | openssl pkeyutl -sign -inkey /etc/bridgehead/pki/${SITE_ID}.priv.pem | base64 | head -c 30)" LOCAL_SALT="$(echo \"local-random-salt\" | openssl pkeyutl -sign -inkey /etc/bridgehead/pki/${SITE_ID}.priv.pem | base64 | head -c 30)"
fi fi
}

View File

@ -1,8 +1,6 @@
#!/bin/bash #!/bin/bash
function nngmSetup() {
if [ -n "$NNGM_CTS_APIKEY" ]; then if [ -n "$NNGM_CTS_APIKEY" ]; then
log INFO "nNGM setup detected -- will start nNGM Connector." log INFO "nNGM setup detected -- will start nNGM Connector."
OVERRIDE+=" -f ./$PROJECT/modules/nngm-compose.yml" OVERRIDE+=" -f ./$PROJECT/modules/nngm-compose.yml"
fi fi
}

View File

@ -16,6 +16,5 @@ do
done done
idManagementSetup idManagementSetup
nngmSetup
mtbaSetup mtbaSetup
adt2fhirRestSetup adt2fhirRestSetup