to squash

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"

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"

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"

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"

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"

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"

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

minimal/vars

@@ -1,3 +1,5 @@
+
+source vars
 for module in $PROJECT/modules/*.sh
 do
     log DEBUG "sourcing $module"