From 44134550acb00b42c775e0cec37d928366aa2510 Mon Sep 17 00:00:00 2001
From: juarez <d.juarez@dkfz-heidelberg.de>
Date: Fri, 7 Jul 2023 09:52:35 +0200
Subject: [PATCH] update new broker

---
 ccp/modules/exliquid-compose.yml   |  0
 ccp/modules/exliquid-setup.sh      |  0
 ccp/modules/exporter-compose.yml   |  4 ++++
 ccp/modules/id-management-setup.sh | 15 ---------------
 ccp/modules/mtba-compose.yml       | 13 ++++++++-----
 5 files changed, 12 insertions(+), 20 deletions(-)
 delete mode 100644 ccp/modules/exliquid-compose.yml
 delete mode 100644 ccp/modules/exliquid-setup.sh

diff --git a/ccp/modules/exliquid-compose.yml b/ccp/modules/exliquid-compose.yml
deleted file mode 100644
index e69de29..0000000
diff --git a/ccp/modules/exliquid-setup.sh b/ccp/modules/exliquid-setup.sh
deleted file mode 100644
index e69de29..0000000
diff --git a/ccp/modules/exporter-compose.yml b/ccp/modules/exporter-compose.yml
index a64d5d4..5670142 100644
--- a/ccp/modules/exporter-compose.yml
+++ b/ccp/modules/exporter-compose.yml
@@ -49,6 +49,8 @@ services:
       EXPORTER_API_KEY: "${EXPORTER_API_KEY}"
       EXPORTER_URL: "http://exporter:8092"
       LOG_FHIR_VALIDATION: "false"
+#    volumes:
+#      - "bridgehead-reporter:/app/reports"
     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.reporter_ccp.rule=PathPrefix(`/ccp-reporter`)"
@@ -62,3 +64,5 @@ volumes:
     name: "bridgehead-exporter-db"
 #  bridgehead-exporter:
 #    name: "bridgehead-exporter"
+#  bridgehead-reporter:
+#    name: "bridgehead-reporter"
diff --git a/ccp/modules/id-management-setup.sh b/ccp/modules/id-management-setup.sh
index 2b1bbf0..1b347e7 100644
--- a/ccp/modules/id-management-setup.sh
+++ b/ccp/modules/id-management-setup.sh
@@ -51,18 +51,3 @@ function legacyIdMapping() {
 	normalized_string=$(applySpecialCases "$uppercase_string");
 	echo "$normalized_string" | tr -d ' '
 }
-
-if [ -n "$IDMANAGER_UPLOAD_APIKEY" ]; then
-  log INFO "id-management setup detected -- will start id-management (mainzelliste & magicpl)."
-  OVERRIDE+=" -f ./$PROJECT/modules/id-management-compose.yml"
-
-  # Auto Generate local Passwords
-  PATIENTLIST_POSTGRES_PASSWORD="$(echo \"id-management-module-db-password-salt\" | openssl rsautl -sign -inkey /etc/bridgehead/pki/${SITE_ID}.priv.pem | base64 | head -c 30)"
-  IDMANAGER_LOCAL_PATIENTLIST_APIKEY="$(cat /proc/sys/kernel/random/uuid | sed 's/[-]//g' | head -c 20)"
-
-  # Transform Seeds Configuration to pass it to the Mainzelliste Container
-  PATIENTLIST_SEEDS_TRANSFORMED="$(declare -p PATIENTLIST_SEEDS | tr -d '\"' | sed 's/\[/\[\"/g' | sed 's/\]/\"\]/g')"
-
-  # Ensure old ids are working !!!
-  export IDMANAGEMENT_FRIENDLY_ID=$(legacyIdMapping "$SITE_ID")
-fi
diff --git a/ccp/modules/mtba-compose.yml b/ccp/modules/mtba-compose.yml
index a59f109..60845f5 100644
--- a/ccp/modules/mtba-compose.yml
+++ b/ccp/modules/mtba-compose.yml
@@ -19,11 +19,11 @@ services:
       FILE_CHARSET: ${MTBA_FILE_CHARSET}
       FILE_END_OF_LINE: ${MTBA_FILE_END_OF_LINE}
       CSV_DELIMITER: ${MTBA_CSV_DELIMITER}
-#    labels:
-#      - "traefik.enable=true"
-#      - "traefik.http.routers.mtba.rule=PathPrefix(`/mtba`)"
-#      - "traefik.http.services.mtba.loadbalancer.server.port=80"
-#      - "traefik.http.routers.mtba.tls=true"
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.routers.mtba.rule=PathPrefix(`/`)"
+      - "traefik.http.services.mtba.loadbalancer.server.port=80"
+      - "traefik.http.routers.mtba.tls=true"
     volumes:
       - /tmp/bridgehead/mtba/input:/app/input
       - /tmp/bridgehead/mtba/persist:/app/persist
@@ -31,3 +31,6 @@ services:
   # TODO: Include CBioPortal in Deployment ...
   # NOTE: CBioPortal can't load data while the system is running. So after import of data bridgehead needs to be restarted!
   # TODO: Find a trigger to let mtba signal a restart for CBioPortal
+
+volumes:
+  mtba-data: