From 2074461ee770fd7199fa9d4ced41ca2fefaf2df9 Mon Sep 17 00:00:00 2001 From: Martin Lablans Date: Mon, 8 Jan 2024 13:03:12 +0100 Subject: [PATCH] Use new variable ENVIRONMENT in /etc/bridgehead; defaults to "production". --- bbmri/modules/eric-setup.sh | 24 ++++++++++++++++-------- bridgehead | 3 +++ 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/bbmri/modules/eric-setup.sh b/bbmri/modules/eric-setup.sh index b45741e..fc689e8 100644 --- a/bbmri/modules/eric-setup.sh +++ b/bbmri/modules/eric-setup.sh @@ -4,15 +4,23 @@ if [ "${ENABLE_ERIC}" == "true" ]; then log INFO "BBMRI-ERIC setup detected -- will start services for BBMRI-ERIC." OVERRIDE+=" -f ./$PROJECT/modules/eric-compose.yml" - # Set required variables - ERIC_BROKER_ID=broker.bbmri.samply.de - ERIC_ROOT_CERT=eric + # The environment needs to be defined in /etc/bridgehead + case "$ENVIRONMENT" in + "production") + ERIC_BROKER_ID=broker.bbmri.samply.de + ERIC_ROOT_CERT=eric + ;; + "test") + ERIC_BROKER_ID=broker-test.bbmri-test.samply.de + ERIC_ROOT_CERT=eric.test + ;; + *) + report_error 6 "Environment \"$ENVIRONMENT\" is unknown. Assuming production. FIX THIS!" + ERIC_BROKER_ID=broker.bbmri.samply.de + ERIC_ROOT_CERT=eric + ;; + esac - if [ "{$ENABLE_TEST}" == "true" ]; then - ERIC_BROKER_ID=broker-test.bbmri-test.samply.de - ERIC_ROOT_CERT=eric.test - fi - ERIC_BROKER_URL=https://${ERIC_BROKER_ID} ERIC_PROXY_ID=${SITE_ID}.${ERIC_BROKER_ID} ERIC_FOCUS_BEAM_SECRET_SHORT="$(cat /proc/sys/kernel/random/uuid | sed 's/[-]//g' | head -c 20)" diff --git a/bridgehead b/bridgehead index 8db9735..cfaabcc 100755 --- a/bridgehead +++ b/bridgehead @@ -66,6 +66,9 @@ loadVars() { detectCompose setHostname setupProxy + + # Set some project-independent default values + : ${ENVIRONMENT:=production} } case "$ACTION" in