samply
/
bridgehead
mirror of https://github.com/samply/bridgehead.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hotfix snap

This commit is contained in:
p.delpy@dkfz-heidelberg.de 2023-03-24 10:54:18 +01:00
parent ac160ab981
commit 3a47cc0796
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
snap/docker-compose.yml
View File

@ -45,7 +45,7 @@ services:
container_name: bridgehead-spot container_name: bridgehead-spot
environment: environment:
SECRET: ${SPOT_BEAM_SECRET_LONG} SECRET: ${SPOT_BEAM_SECRET_LONG}
APPID: spot APPID: snap
PROXY_ID: ${PROXY_ID} PROXY_ID: ${PROXY_ID}
LDM_URL: ${LDM_URL} LDM_URL: ${LDM_URL}
AUTH_USER: ${AUTH_USER} AUTH_USER: ${AUTH_USER}
@ -68,6 +68,7 @@ services:
ROOTCERT_FILE: /conf/root.crt.pem ROOTCERT_FILE: /conf/root.crt.pem
secrets: secrets:
- proxy.pem - proxy.pem
- root.crt.pem
depends_on: depends_on:
- "forward_proxy" - "forward_proxy"
volumes: volumes:
@ -81,3 +82,5 @@ volumes:
secrets: secrets:
proxy.pem: proxy.pem:
file: /etc/bridgehead/pki/${SITE_ID}.priv.pem file: /etc/bridgehead/pki/${SITE_ID}.priv.pem
root.crt.pem:
file: /srv/docker/bridgehead/snap/root.crt.pem

2
snap/vars
View File

@ -2,7 +2,7 @@ BROKER_ID=broker.dev.ccp-it.dktk.dkfz.de
BROKER_URL=https://${BROKER_ID} BROKER_URL=https://${BROKER_ID}
PROXY_ID=${SITE_ID}.${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_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_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}" REPORTHUB_BEAM_SECRET_LONG="ApiKey report-hub.${PROXY_ID} ${REPORTHUB_BEAM_SECRET_SHORT}"
SUPPORT_EMAIL=support-ccp@dkfz-heidelberg.de SUPPORT_EMAIL=support-ccp@dkfz-heidelberg.de