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

Make config consistent across projects

This commit is contained in:
Martin Lablans 2024-02-14 11:50:31 +01:00
parent d832cfdd43
commit 7837d3b542
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ccp/docker-compose.yml
View File

@ -40,7 +40,7 @@ services:
BROKER_URL: ${BROKER_URL} BROKER_URL: ${BROKER_URL}
PROXY_ID: ${PROXY_ID} PROXY_ID: ${PROXY_ID}
APP_focus_KEY: ${FOCUS_BEAM_SECRET_SHORT} APP_focus_KEY: ${FOCUS_BEAM_SECRET_SHORT}
APP_monitoring_KEY: ${MONITORING_BEAM_SECRET_SHORT} APP_monitoring_KEY: ${CCP_MONITORING_BEAM_SECRET_SHORT}
PRIVKEY_FILE: /run/secrets/proxy.pem PRIVKEY_FILE: /run/secrets/proxy.pem
ALL_PROXY: http://forward_proxy:3128 ALL_PROXY: http://forward_proxy:3128
TLS_CA_CERTIFICATES_DIR: /conf/trusted-ca-certs TLS_CA_CERTIFICATES_DIR: /conf/trusted-ca-certs
@ -58,7 +58,7 @@ services:
container_name: bridgehead-monitoring-ccp container_name: bridgehead-monitoring-ccp
environment: environment:
- BEAM_ID=monitoring.${PROXY_ID} - BEAM_ID=monitoring.${PROXY_ID}
- BEAM_API_KEY=${MONITORING_BEAM_SECRET_SHORT} - BEAM_API_KEY=${CCP_MONITORING_BEAM_SECRET_SHORT}
- BEAM_PROXY_URL=http://beam-proxy:8081 - BEAM_PROXY_URL=http://beam-proxy:8081
depends_on: depends_on:
- beam-proxy - beam-proxy

2
ccp/modules/ccp-setup.sh Normal file
View File

@ -0,0 +1,2 @@
#Monitoring
CCP_MONITORING_BEAM_SECRET_SHORT="$(cat /proc/sys/kernel/random/uuid | sed 's/[-]//g' | head -c 20)"

1
ccp/vars
View File

@ -2,7 +2,6 @@ BROKER_ID=broker.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}
FOCUS_BEAM_SECRET_SHORT="$(cat /proc/sys/kernel/random/uuid | sed 's/[-]//g' | head -c 20)" FOCUS_BEAM_SECRET_SHORT="$(cat /proc/sys/kernel/random/uuid | sed 's/[-]//g' | head -c 20)"
MONITORING_BEAM_SECRET_SHORT="$(cat /proc/sys/kernel/random/uuid | sed 's/[-]//g' | head -c 20)"
FOCUS_RETRY_COUNT=32 FOCUS_RETRY_COUNT=32
SUPPORT_EMAIL=support-ccp@dkfz-heidelberg.de SUPPORT_EMAIL=support-ccp@dkfz-heidelberg.de
PRIVATEKEYFILENAME=/etc/bridgehead/pki/${SITE_ID}.priv.pem PRIVATEKEYFILENAME=/etc/bridgehead/pki/${SITE_ID}.priv.pem