verbis-admin
/
bridgehead
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge 6791e9541f into 10ec2b0e92

This commit is contained in:
patrickskowronekdkfz 2022-12-06 12:38:03 +01:00 committed by GitHub
parent 10ec2b0e92 6791e9541f
commit 3e2c1d1ab3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ccp/docker-compose.yml
View File

@ -94,6 +94,8 @@ services:
APP_0_KEY: ${SPOT_BEAM_SECRET_SHORT} APP_0_KEY: ${SPOT_BEAM_SECRET_SHORT}
APP_1_ID: report-hub APP_1_ID: report-hub
APP_1_KEY: ${REPORTHUB_BEAM_SECRET_SHORT} APP_1_KEY: ${REPORTHUB_BEAM_SECRET_SHORT}
APP_2_ID: monitoring
APP_2_KEY: ${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
@ -106,6 +108,17 @@ services:
- /etc/bridgehead/trusted-ca-certs:/conf/trusted-ca-certs:ro - /etc/bridgehead/trusted-ca-certs:/conf/trusted-ca-certs:ro
- ./root.crt.pem:/conf/root.crt.pem:ro - ./root.crt.pem:/conf/root.crt.pem:ro
monitoring:
image: "samply/bridgehead-monitoring:main"
container_name: bridgehead-monitoring
environment:
HOST: ${HOST}
SITE_NAME: ${SITE_NAME}
PROJECT: ${PROJECT}
BEAM_URL: http://beam-proxy:8081
PROXY_ID: monitoring.${PROXY_ID}
MONITORING_TARGET: ${MONITORING_TARGET}
KEY: ${MONITORING_BEAM_SECRET_SHORT}
volumes: volumes:
blaze-data: blaze-data:

1
ccp/vars
View File

@ -4,6 +4,7 @@ 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 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_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)"
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
PRIVATEKEYFILENAME=/etc/bridgehead/pki/${SITE_ID}.priv.pem PRIVATEKEYFILENAME=/etc/bridgehead/pki/${SITE_ID}.priv.pem