From 49b5cb976ac0f71e4e93c22e56484d049c284433 Mon Sep 17 00:00:00 2001 From: janskiba Date: Fri, 22 Sep 2023 07:25:04 +0000 Subject: [PATCH 1/2] Use GBN Broker for timesync if ERIC is disabled --- bbmri/vars | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bbmri/vars b/bbmri/vars index 1cb6128..bd91f5e 100644 --- a/bbmri/vars +++ b/bbmri/vars @@ -14,7 +14,7 @@ do done SUPPORT_EMAIL=$ERIC_SUPPORT_EMAIL -BROKER_URL_FOR_PREREQ=$ERIC_BROKER_URL +BROKER_URL_FOR_PREREQ="{$ERIC_BROKER_URL:-$GBN_BROKER_URL}" if [ -n "$GBN_SUPPORT_EMAIL" ]; then SUPPORT_EMAIL=$GBN_SUPPORT_EMAIL @@ -34,4 +34,4 @@ function do_enroll { echo echo "You just received $COUNT certificate signing requests (CSR). Please send $COUNT e-mails, with 1 CSR each, to the respective e-mail address." fi -} \ No newline at end of file +} From a4ce7f4eb67c293747e8563248eb308d821557cb Mon Sep 17 00:00:00 2001 From: janskiba Date: Fri, 22 Sep 2023 07:35:05 +0000 Subject: [PATCH 2/2] Fix subsitution --- bbmri/vars | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bbmri/vars b/bbmri/vars index bd91f5e..d1362fb 100644 --- a/bbmri/vars +++ b/bbmri/vars @@ -14,7 +14,7 @@ do done SUPPORT_EMAIL=$ERIC_SUPPORT_EMAIL -BROKER_URL_FOR_PREREQ="{$ERIC_BROKER_URL:-$GBN_BROKER_URL}" +BROKER_URL_FOR_PREREQ="${ERIC_BROKER_URL:-$GBN_BROKER_URL}" if [ -n "$GBN_SUPPORT_EMAIL" ]; then SUPPORT_EMAIL=$GBN_SUPPORT_EMAIL