From 2eb9a1e979ac2561e3785e31d59cba46b5b81a02 Mon Sep 17 00:00:00 2001 From: Martin Lablans Date: Mon, 17 Oct 2022 11:09:08 +0200 Subject: [PATCH] Add SUPPORT_EMAIL --- bridgehead | 6 +----- ccp/vars | 1 + 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/bridgehead b/bridgehead index 74916e3..2362891 100755 --- a/bridgehead +++ b/bridgehead @@ -82,11 +82,7 @@ case "$ACTION" in echo "Private key already exists at /etc/bridgehead/pki/${SITE_ID}.priv.pem. Please delete first to proceed." exit 1 fi - OPTS="" - if [ -n "$OPERATOR_EMAIL" ]; then - OPTS+="--admin-email $OPERATOR_EMAIL" - fi - docker run --rm -ti -v /etc/bridgehead/pki:/pki samply/beam-enroll:latest --output-path /pki --proxy-id $PROXY_ID $OPTS + docker run --rm -ti -v /etc/bridgehead/pki:/etc/bridgehead/pki samply/beam-enroll:latest --output-path /etc/bridgehead/pki --proxy-id $PROXY_ID --admin-email $SUPPORT_EMAIL ;; preRun | preUpdate) fixPermissions diff --git a/ccp/vars b/ccp/vars index 4152fa4..6003ceb 100644 --- a/ccp/vars +++ b/ccp/vars @@ -5,3 +5,4 @@ SPOT_BEAM_SECRET_SHORT="$(cat /proc/sys/kernel/random/uuid | sed 's/[-]//g' | he SPOT_BEAM_SECRET_LONG="ApiKey spot.${PROXY_ID} ${SPOT_BEAM_SECRET_SHORT}" REPORTHUB_BEAM_SECRET_SHORT="$(cat /proc/sys/kernel/random/uuid | sed 's/[-]//g' | head -c 20)" REPORTHUB_BEAM_SECRET_LONG="ApiKey report-hub.${PROXY_ID} ${REPORTHUB_BEAM_SECRET_SHORT}" +SUPPORT_EMAIL=ccp-service@dkfz-heidelberg.de