From 5f5e62650123561c12b6dbe8b835e4380b2954be Mon Sep 17 00:00:00 2001 From: Pierre Delpy Date: Tue, 15 Oct 2024 11:54:26 +0200 Subject: [PATCH] minor fix --- bbmri/vars | 2 +- bridgehead | 2 +- cce/vars | 2 +- ccp/vars | 2 +- dhki/vars | 2 +- itcc/vars | 2 +- kr/vars | 2 +- minimal/vars | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/bbmri/vars b/bbmri/vars index 1c08f8e..69c6f2c 100644 --- a/bbmri/vars +++ b/bbmri/vars @@ -7,7 +7,7 @@ FOCUS_RETRY_COUNT=${FOCUS_RETRY_COUNT:-64} PRIVATEKEYFILENAME=/etc/bridgehead/pki/${SITE_ID}.priv.pem -source vars +source versions for module in $PROJECT/modules/*.sh do log DEBUG "sourcing $module" diff --git a/bridgehead b/bridgehead index 465682d..dc2da22 100755 --- a/bridgehead +++ b/bridgehead @@ -64,7 +64,7 @@ loadVars() { fetchVarsFromVaultByFile /etc/bridgehead/$PROJECT.conf || fail_and_report 1 "Unable to fetchVarsFromVaultByFile" setHostname optimizeBlazeMemoryUsage - [ -e ./$PROJECT/vars ] && source ./vars ./$PROJECT/vars + [ -e ./$PROJECT/vars ] && source ./versions ./$PROJECT/vars set +a OVERRIDE=${OVERRIDE:=""} diff --git a/cce/vars b/cce/vars index a5c850a..53cd422 100644 --- a/cce/vars +++ b/cce/vars @@ -7,7 +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 +source versions for module in $PROJECT/modules/*.sh do log DEBUG "sourcing $module" diff --git a/ccp/vars b/ccp/vars index 66e886d..1e5599d 100644 --- a/ccp/vars +++ b/ccp/vars @@ -18,7 +18,7 @@ OIDC_URL="https://login.verbis.dkfz.de" OIDC_ISSUER_URL="${OIDC_URL}/realms/${OIDC_REALM}" OIDC_GROUP_CLAIM="groups" -source vars +source versions for module in $PROJECT/modules/*.sh do log DEBUG "sourcing $module" diff --git a/dhki/vars b/dhki/vars index 21c62fc..e9047ce 100644 --- a/dhki/vars +++ b/dhki/vars @@ -8,7 +8,7 @@ PRIVATEKEYFILENAME=/etc/bridgehead/pki/${SITE_ID}.priv.pem BROKER_URL_FOR_PREREQ=$BROKER_URL -source vars +source versions for module in ccp/modules/*.sh do log DEBUG "sourcing $module" diff --git a/itcc/vars b/itcc/vars index cec493f..a7964ec 100644 --- a/itcc/vars +++ b/itcc/vars @@ -7,7 +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 +source versions for module in $PROJECT/modules/*.sh do log DEBUG "sourcing $module" diff --git a/kr/vars b/kr/vars index bbba515..687d0ce 100644 --- a/kr/vars +++ b/kr/vars @@ -7,7 +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 +source versions for module in $PROJECT/modules/*.sh do log DEBUG "sourcing $module" diff --git a/minimal/vars b/minimal/vars index ee4701f..1b4f7c5 100644 --- a/minimal/vars +++ b/minimal/vars @@ -1,5 +1,5 @@ -source vars +source versions for module in $PROJECT/modules/*.sh do log DEBUG "sourcing $module"