From c41ebd226d1c76a71c16d3b7ec3148c6c5326d1f Mon Sep 17 00:00:00 2001
From: Enola Knezevic <enola.knezevic@dkfz-heidelberg.de>
Date: Fri, 16 Jun 2023 16:24:48 +0200
Subject: [PATCH 1/3] =?UTF-8?q?DKTK=20local=20spot=20->=20focus=20?=
 =?UTF-8?q?=F0=9F=A5=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ccp/docker-compose.yml | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/ccp/docker-compose.yml b/ccp/docker-compose.yml
index 209ee70..910bac7 100644
--- a/ccp/docker-compose.yml
+++ b/ccp/docker-compose.yml
@@ -71,15 +71,17 @@ services:
       - "traefik.http.routers.blaze_ccp.middlewares=ccp_b_strip,auth"
       - "traefik.http.routers.blaze_ccp.tls=true"
 
-  spot:
-    image: docker.verbis.dkfz.de/cache/samply/spot:latest
-    container_name: bridgehead-spot
+  focus:
+    image: docker.verbis.dkfz.de/cache/samply/focus:develop
+    container_name: bridgehead-focus
     environment:
-      SECRET: ${SPOT_BEAM_SECRET_LONG}
-      APPID: spot
+      SECRET: ${FOCUS_BEAM_SECRET_SHORT}
+      BEAM_APP_ID_LONG: focus.${PROXY_ID}
       PROXY_ID: ${PROXY_ID}
-      LDM_URL: http://bridgehead-ccp-blaze:8080/fhir
-      BEAM_PROXY: http://beam-proxy:8081
+      BLAZE_URL: "http://bridgehead-ccp-blaze:8080/fhir/"
+      BEAM_PROXY_URL: http://beam-proxy:8081
+      RETRY_COUNT: ${FOCUS_RETRY_COUNT}
+      OBFUSCATE: "no"
     depends_on:
       - "beam-proxy"
       - "blaze"
@@ -90,8 +92,8 @@ services:
     environment:
       BROKER_URL: ${BROKER_URL}
       PROXY_ID: ${PROXY_ID}
-      APP_0_ID: spot
-      APP_0_KEY: ${SPOT_BEAM_SECRET_SHORT}
+      APP_0_ID: focus
+      APP_0_KEY: ${FOCUS_BEAM_SECRET_SHORT}
       APP_1_ID: report-hub
       APP_1_KEY: ${REPORTHUB_BEAM_SECRET_SHORT}
       PRIVKEY_FILE: /run/secrets/proxy.pem

From 9dadd3efa0497ac09ddbf5ac9877075fb0083b03 Mon Sep 17 00:00:00 2001
From: Enola Knezevic <enola.knezevic@dkfz-heidelberg.de>
Date: Fri, 16 Jun 2023 16:28:22 +0200
Subject: [PATCH 2/3] variables

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

diff --git a/ccp/vars b/ccp/vars
index 5172d24..cc0bccd 100644
--- a/ccp/vars
+++ b/ccp/vars
@@ -1,8 +1,8 @@
 BROKER_ID=broker.dev.ccp-it.dktk.dkfz.de
 BROKER_URL=https://${BROKER_ID}
 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_LONG="ApiKey spot.${PROXY_ID} ${SPOT_BEAM_SECRET_SHORT}"
+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

From 5642141f3f69279f3ab722567680c9d83219560d Mon Sep 17 00:00:00 2001
From: Enola Knezevic <enola.knezevic@dkfz-heidelberg.de>
Date: Mon, 19 Jun 2023 10:32:39 +0200
Subject: [PATCH 3/3] CCP focus develop -> main

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

diff --git a/ccp/docker-compose.yml b/ccp/docker-compose.yml
index 910bac7..bc462f7 100644
--- a/ccp/docker-compose.yml
+++ b/ccp/docker-compose.yml
@@ -72,7 +72,7 @@ services:
       - "traefik.http.routers.blaze_ccp.tls=true"
 
   focus:
-    image: docker.verbis.dkfz.de/cache/samply/focus:develop
+    image: docker.verbis.dkfz.de/cache/samply/focus:main
     container_name: bridgehead-focus
     environment:
       SECRET: ${FOCUS_BEAM_SECRET_SHORT}