From 022d6e9a72ebbc2d5008b6bd98601ddda92e2d67 Mon Sep 17 00:00:00 2001 From: Pierre Delpy Date: Tue, 15 Oct 2024 10:44:14 +0200 Subject: [PATCH] to squash --- bbmri/vars | 1 + cce/vars | 1 + ccp/vars | 1 + dhki/vars | 1 + itcc/vars | 1 + kr/vars | 1 + lib/prerequisites.sh | 2 +- minimal/vars | 2 ++ 8 files changed, 9 insertions(+), 1 deletion(-) diff --git a/bbmri/vars b/bbmri/vars index 248fbee..1c08f8e 100644 --- a/bbmri/vars +++ b/bbmri/vars @@ -7,6 +7,7 @@ FOCUS_RETRY_COUNT=${FOCUS_RETRY_COUNT:-64} PRIVATEKEYFILENAME=/etc/bridgehead/pki/${SITE_ID}.priv.pem +source vars for module in $PROJECT/modules/*.sh do log DEBUG "sourcing $module" diff --git a/cce/vars b/cce/vars index 7d0c1a3..a5c850a 100644 --- a/cce/vars +++ b/cce/vars @@ -7,6 +7,7 @@ SUPPORT_EMAIL=manoj.waikar@dkfz-heidelberg.de PRIVATEKEYFILENAME=/etc/bridgehead/pki/${SITE_ID}.priv.pem BROKER_URL_FOR_PREREQ=$BROKER_URL +source vars for module in $PROJECT/modules/*.sh do log DEBUG "sourcing $module" diff --git a/ccp/vars b/ccp/vars index c57f8c8..66e886d 100644 --- a/ccp/vars +++ b/ccp/vars @@ -18,6 +18,7 @@ OIDC_URL="https://login.verbis.dkfz.de" OIDC_ISSUER_URL="${OIDC_URL}/realms/${OIDC_REALM}" OIDC_GROUP_CLAIM="groups" +source vars for module in $PROJECT/modules/*.sh do log DEBUG "sourcing $module" diff --git a/dhki/vars b/dhki/vars index 6662468..21c62fc 100644 --- a/dhki/vars +++ b/dhki/vars @@ -8,6 +8,7 @@ PRIVATEKEYFILENAME=/etc/bridgehead/pki/${SITE_ID}.priv.pem BROKER_URL_FOR_PREREQ=$BROKER_URL +source vars for module in ccp/modules/*.sh do log DEBUG "sourcing $module" diff --git a/itcc/vars b/itcc/vars index b03403b..cec493f 100644 --- a/itcc/vars +++ b/itcc/vars @@ -7,6 +7,7 @@ SUPPORT_EMAIL=arturo.macias@dkfz-heidelberg.de PRIVATEKEYFILENAME=/etc/bridgehead/pki/${SITE_ID}.priv.pem BROKER_URL_FOR_PREREQ=$BROKER_URL +source vars for module in $PROJECT/modules/*.sh do log DEBUG "sourcing $module" diff --git a/kr/vars b/kr/vars index d4e5a27..bbba515 100644 --- a/kr/vars +++ b/kr/vars @@ -7,6 +7,7 @@ SUPPORT_EMAIL=arturo.macias@dkfz-heidelberg.de PRIVATEKEYFILENAME=/etc/bridgehead/pki/${SITE_ID}.priv.pem BROKER_URL_FOR_PREREQ=$BROKER_URL +source vars for module in $PROJECT/modules/*.sh do log DEBUG "sourcing $module" diff --git a/lib/prerequisites.sh b/lib/prerequisites.sh index 2c1e186..b37aac4 100755 --- a/lib/prerequisites.sh +++ b/lib/prerequisites.sh @@ -67,7 +67,7 @@ fi log INFO "Checking network access ($BROKER_URL_FOR_PREREQ) ..." source "${CONFIG_DIR}${PROJECT}".conf -source ${PROJECT}/vars +source ${PROJECT}/vars vars if [ "${PROJECT}" != "minimal" ]; then set +e diff --git a/minimal/vars b/minimal/vars index 11d07ff..ee4701f 100644 --- a/minimal/vars +++ b/minimal/vars @@ -1,3 +1,5 @@ + +source vars for module in $PROJECT/modules/*.sh do log DEBUG "sourcing $module"