diff --git a/ccp/docker-compose.yml b/ccp/docker-compose.yml index 24046f5..03e9d83 100644 --- a/ccp/docker-compose.yml +++ b/ccp/docker-compose.yml @@ -40,7 +40,7 @@ services: BROKER_URL: ${BROKER_URL} PROXY_ID: ${PROXY_ID} 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 ALL_PROXY: http://forward_proxy:3128 TLS_CA_CERTIFICATES_DIR: /conf/trusted-ca-certs @@ -58,7 +58,7 @@ services: container_name: bridgehead-monitoring-ccp environment: - 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 depends_on: - beam-proxy diff --git a/ccp/modules/ccp-setup.sh b/ccp/modules/ccp-setup.sh new file mode 100644 index 0000000..fcd20e7 --- /dev/null +++ b/ccp/modules/ccp-setup.sh @@ -0,0 +1,2 @@ +#Monitoring +CCP_MONITORING_BEAM_SECRET_SHORT="$(cat /proc/sys/kernel/random/uuid | sed 's/[-]//g' | head -c 20)" \ No newline at end of file diff --git a/ccp/vars b/ccp/vars index 8c7c78e..0c80e8a 100644 --- a/ccp/vars +++ b/ccp/vars @@ -2,7 +2,6 @@ BROKER_ID=broker.ccp-it.dktk.dkfz.de BROKER_URL=https://${BROKER_ID} PROXY_ID=${SITE_ID}.${BROKER_ID} 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 SUPPORT_EMAIL=support-ccp@dkfz-heidelberg.de PRIVATEKEYFILENAME=/etc/bridgehead/pki/${SITE_ID}.priv.pem