From eac93748154e1c93fa2330c44f00c8a729ab8c95 Mon Sep 17 00:00:00 2001 From: janskiba Date: Thu, 23 May 2024 09:38:37 +0200 Subject: [PATCH] feat: Add file-dispatcher to exporter compose --- ccp/modules/exporter-compose.yml | 13 +++++++++++++ ccp/modules/exporter-setup.sh | 1 + 2 files changed, 14 insertions(+) diff --git a/ccp/modules/exporter-compose.yml b/ccp/modules/exporter-compose.yml index d5eb227..971e45a 100644 --- a/ccp/modules/exporter-compose.yml +++ b/ccp/modules/exporter-compose.yml @@ -65,3 +65,16 @@ services: - "traefik.http.routers.reporter_ccp.tls=true" - "traefik.http.middlewares.reporter_ccp_strip.stripprefix.prefixes=/ccp-reporter" - "traefik.http.routers.reporter_ccp.middlewares=reporter_ccp_strip" + + file-dispatcher: + image: docker.verbis.dkfz.de/cache/samply/file-dispatcher:latest + environment: + - BEAM_ID=file-dispatcher.${PROXY_ID} + - PROJECT_MANAGER_ID=project-manager.request-manager.${BROKER_ID} + - BEAM_SECRET=${FILE_DISPATCHER_BEAM_SECRET} # Generated in exporter-setup.sh + - BEAM_URL=http://beam-proxy:8081 + - EXPORTER_URL=http://exporter:8092 + + beam-proxy: + environment: + - APP_file-dispatcher_KEY=${FILE_DISPATCHER_BEAM_SECRET} \ No newline at end of file diff --git a/ccp/modules/exporter-setup.sh b/ccp/modules/exporter-setup.sh index 9b947a6..dd2efd2 100644 --- a/ccp/modules/exporter-setup.sh +++ b/ccp/modules/exporter-setup.sh @@ -5,4 +5,5 @@ if [ "$ENABLE_EXPORTER" == true ]; then OVERRIDE+=" -f ./$PROJECT/modules/exporter-compose.yml" EXPORTER_DB_PASSWORD="$(echo \"This is a salt string to generate one consistent password for the exporter. It is not required to be secret.\" | sha1sum | openssl pkeyutl -sign -inkey /etc/bridgehead/pki/${SITE_ID}.priv.pem | base64 | head -c 30)" EXPORTER_API_KEY="$(echo \"This is a salt string to generate one consistent API KEY for the exporter. It is not required to be secret.\" | sha1sum | openssl pkeyutl -sign -inkey /etc/bridgehead/pki/${SITE_ID}.priv.pem | base64 | head -c 64)" + FILE_DISPATCHER_BEAM_SECRET="$(cat /proc/sys/kernel/random/uuid | sed 's/[-]//g' | head -c 20)" fi