From 3a47cc079653e989a71a534512999b45d16a5c16 Mon Sep 17 00:00:00 2001 From: "p.delpy@dkfz-heidelberg.de" Date: Fri, 24 Mar 2023 10:54:18 +0100 Subject: [PATCH] hotfix snap --- snap/docker-compose.yml | 5 ++++- snap/vars | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/snap/docker-compose.yml b/snap/docker-compose.yml index 1acb7f0..0ca6746 100644 --- a/snap/docker-compose.yml +++ b/snap/docker-compose.yml @@ -45,7 +45,7 @@ services: container_name: bridgehead-spot environment: SECRET: ${SPOT_BEAM_SECRET_LONG} - APPID: spot + APPID: snap PROXY_ID: ${PROXY_ID} LDM_URL: ${LDM_URL} AUTH_USER: ${AUTH_USER} @@ -68,6 +68,7 @@ services: ROOTCERT_FILE: /conf/root.crt.pem secrets: - proxy.pem + - root.crt.pem depends_on: - "forward_proxy" volumes: @@ -81,3 +82,5 @@ volumes: secrets: proxy.pem: file: /etc/bridgehead/pki/${SITE_ID}.priv.pem + root.crt.pem: + file: /srv/docker/bridgehead/snap/root.crt.pem diff --git a/snap/vars b/snap/vars index ce12d1a..c087312 100644 --- a/snap/vars +++ b/snap/vars @@ -2,7 +2,7 @@ BROKER_ID=broker.dev.ccp-it.dktk.dkfz.de BROKER_URL=https://${BROKER_ID} PROXY_ID=${SITE_ID}.${BROKER_ID} SPOT_BEAM_SECRET_SHORT="$(cat /proc/sys/kernel/random/uuid | sed 's/[-]//g' | head -c 20)" -SPOT_BEAM_SECRET_LONG="ApiKey spot.${PROXY_ID} ${SPOT_BEAM_SECRET_SHORT}" +SPOT_BEAM_SECRET_LONG="ApiKey snap.${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=support-ccp@dkfz-heidelberg.de