From f5102756854216bd025916a8021a4c6e8cc380cb Mon Sep 17 00:00:00 2001
From: Patrick Skowronek <patrick.skowronek@dkfz-heidelberg.de>
Date: Fri, 30 Jun 2023 12:30:19 +0200
Subject: [PATCH 1/3] Deleted EXLIQUID setup + compose

---
 ccp/exliquid-compose.yml | 34 ----------------------------------
 ccp/exliquid-setup.sh    | 19 -------------------
 ccp/vars                 |  2 --
 3 files changed, 55 deletions(-)
 delete mode 100644 ccp/exliquid-compose.yml
 delete mode 100644 ccp/exliquid-setup.sh

diff --git a/ccp/exliquid-compose.yml b/ccp/exliquid-compose.yml
deleted file mode 100644
index becf99a..0000000
--- a/ccp/exliquid-compose.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-version: "3.7"
-
-services:
-  exliquid-task-store:
-    image: docker.verbis.dkfz.de/cache/samply/blaze:0.20
-    container_name: bridgehead-exliquid-task-store
-    environment:
-      BASE_URL: "http://bridgehead-exliquid-task-store:8080"
-      JAVA_TOOL_OPTIONS: "-Xmx1g"
-    volumes:
-    - "exliquid-task-store-data:/app/data"
-    labels:
-      - "traefik.enable=false"
-
-  exliquid-report-hub:
-    image: docker.verbis.dkfz.de/cache/samply/report-hub:latest
-    container_name: bridgehead-exliquid-report-hub
-    environment:
-      SPRING_WEBFLUX_BASE_PATH: "/exliquid"
-      JAVA_TOOL_OPTIONS: "-Xmx1g"
-      APP_BEAM_APPID: "report-hub.${PROXY_ID}"
-      APP_BEAM_SECRET: ${REPORTHUB_BEAM_SECRET_SHORT}
-      APP_BEAM_PROXY_BASEURL: http://beam-proxy:8081
-      APP_TASKSTORE_BASEURL: "http://bridgehead-exliquid-task-store:8080/fhir"
-      APP_DATASTORE_BASEURL:  http://bridgehead-ccp-blaze:8080/fhir
-    restart: always
-    labels:
-      - "traefik.enable=true"
-      - "traefik.http.routers.report-ccp.rule=PathPrefix(`/exliquid`)"
-      - "traefik.http.services.report-ccp.loadbalancer.server.port=8080"
-      - "traefik.http.routers.report-ccp.tls=true"
-
-volumes:
-  exliquid-task-store-data:
\ No newline at end of file
diff --git a/ccp/exliquid-setup.sh b/ccp/exliquid-setup.sh
deleted file mode 100644
index 91909eb..0000000
--- a/ccp/exliquid-setup.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-
-function exliquidSetup() {
-	case ${SITE_ID} in
-		berlin|dresden|essen|frankfurt|freiburg|luebeck|mainz|muenchen-lmu|muenchen-tum|mannheim|tuebingen)
-			EXLIQUID=1
-			;;
-		dktk-test)
-			EXLIQUID=1
-			;;
-		*)
-			EXLIQUID=0
-			;;
-	esac
-	if [[ $EXLIQUID -eq 1 ]]; then
-		log INFO "EXLIQUID setup detected -- will start Report-Hub."
-		OVERRIDE+=" -f ./$PROJECT/exliquid-compose.yml"
-	fi
-}
\ No newline at end of file
diff --git a/ccp/vars b/ccp/vars
index f3ef8ce..b642a9d 100644
--- a/ccp/vars
+++ b/ccp/vars
@@ -15,8 +15,6 @@ idManagementSetup
 source $PROJECT/nngm-setup.sh
 nngmSetup
 
-source $PROJECT/exliquid-setup.sh
-exliquidSetup
 mtbaSetup
 
 for module in $PROJECT/modules/*.sh

From 512f335da871a1526705965860ca3fe45a0a8618 Mon Sep 17 00:00:00 2001
From: Patrick Skowronek <patrick.skowronek@dkfz-heidelberg.de>
Date: Fri, 30 Jun 2023 12:32:25 +0200
Subject: [PATCH 2/3] Removed Report-Hub env var

---
 ccp/docker-compose.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ccp/docker-compose.yml b/ccp/docker-compose.yml
index 786acc9..1e5be26 100644
--- a/ccp/docker-compose.yml
+++ b/ccp/docker-compose.yml
@@ -41,7 +41,6 @@ services:
       BROKER_URL: ${BROKER_URL}
       PROXY_ID: ${PROXY_ID}
       APP_focus_KEY: ${FOCUS_BEAM_SECRET_SHORT}
-      APP_report-hub_KEY: ${REPORTHUB_BEAM_SECRET_SHORT}
       PRIVKEY_FILE: /run/secrets/proxy.pem
       ALL_PROXY: http://forward_proxy:3128
       TLS_CA_CERTIFICATES_DIR: /conf/trusted-ca-certs

From 9ca3e0059e5378f5214f5f7ae7c369974d7c4594 Mon Sep 17 00:00:00 2001
From: Patrick Skowronek <patrick.skowronek@dkfz-heidelberg.de>
Date: Fri, 30 Jun 2023 12:33:34 +0200
Subject: [PATCH 3/3] Rmoved generated of report-hub secret

---
 ccp/vars | 2 --
 1 file changed, 2 deletions(-)

diff --git a/ccp/vars b/ccp/vars
index b642a9d..420b0d0 100644
--- a/ccp/vars
+++ b/ccp/vars
@@ -3,8 +3,6 @@ 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)"
 FOCUS_RETRY_COUNT=32
-REPORTHUB_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}"
 SUPPORT_EMAIL=support-ccp@dkfz-heidelberg.de
 PRIVATEKEYFILENAME=/etc/bridgehead/pki/${SITE_ID}.priv.pem