diff --git a/c4/docker-compose.yml b/c4/docker-compose.yml index 56259aa..43a3169 100644 --- a/c4/docker-compose.yml +++ b/c4/docker-compose.yml @@ -94,7 +94,7 @@ services: MAGICPL_OIDC_PROVIDER: ${MAGICPL_OIDC_PROVIDER} MAGICPL_OIDC_CLIENT_ID: ${MAGICPL_OIDC_CLIENT_ID} MAGICPL_OIDC_CLIENT_SECRET: ${MAGICPL_OIDC_CLIENT_SECRET} - MAGICPL_SITE: adt + MAGICPL_SITE: ${SITEID} MAGICPL_LOG_LEVEL: info TZ: Europe/Berlin volumes: @@ -123,7 +123,7 @@ services: ML_DB_PASS: ${ML_DB_PASS} ML_API_KEY: ${ML_API_KEY} ML_LOG_LEVEL: warning - ML_SITE: adt + ML_SITE: ${SITEID} TZ: Europe/Berlin env_file: - ../site-config/patientlist.env diff --git a/install-bridgehead.sh b/install-bridgehead.sh index adf5b13..fb74ec0 100755 --- a/install-bridgehead.sh +++ b/install-bridgehead.sh @@ -15,13 +15,14 @@ if [ -z "$BRIDGEHEAD_PATH" ] ; then exit fi -cd /etc/systemd/system/ +_systemd_path=/etc/systemd/system/ + echo "Installing bridgehead\@.service in systemd ..." -sudo cp ${BRIDGEHEAD_PATH}/convenience/bridgehead\@.service ./ +sudo cp convenience/bridgehead\@.service $_systemd_path echo "Installing bridgehead\@.update.service in systemd ..." -sudo cp ${BRIDGEHEAD_PATH}/convenience/bridgehead-update\@.service ./ -sudo cp ${BRIDGEHEAD_PATH}/convenience/bridgehead-update\@.timer ./ +sudo cp convenience/bridgehead-update\@.service $_systemd_path +sudo cp convenience/bridgehead-update\@.timer $_systemd_path echo "Loading the bridgehead definitions in systemd" sudo systemctl daemon-reload