From f159ea8c3c650cd51a5791378a9d055f68a1a289 Mon Sep 17 00:00:00 2001
From: Patrick Skowronek <patrick.skowronek@dkfz-heidelberg.de>
Date: Thu, 5 May 2022 08:52:09 +0200
Subject: [PATCH] Fixed some merge issues

---
 ccp/docker-compose.yml        | 14 +++++++-------
 lib/generate.sh               | 16 ++++------------
 lib/setup-bridgehead-units.sh |  4 ----
 3 files changed, 11 insertions(+), 23 deletions(-)

diff --git a/ccp/docker-compose.yml b/ccp/docker-compose.yml
index 99e82eb..33670a2 100644
--- a/ccp/docker-compose.yml
+++ b/ccp/docker-compose.yml
@@ -32,7 +32,7 @@ services:
   
   ### Does need to know the outside proxy to connect central components
   forward_proxy:
-    container_name: bridgehead-squid
+    container_name: bridgehead-forward-proxy
     image: ubuntu/squid
     environment:
       http_proxy: ${http_proxy}
@@ -65,11 +65,11 @@ services:
     - "blaze-data:/app/data"
     labels:
       - "traefik.enable=true"
-      - "traefik.http.middlewares.test-auth.basicauth.users=${bc_auth_users}"
+      - "traefik.http.middlewares.cpp-auth.basicauth.users=${bc_auth_users}"
       - "traefik.http.routers.blaze_ccp.rule=PathPrefix(`/ccp-localdatamanagement`)"
       - "traefik.http.middlewares.ccp_b_strip.stripprefix.prefixes=/ccp-localdatamanagement"
       - "traefik.http.services.blaze_ccp.loadbalancer.server.port=8080"
-      - "traefik.http.routers.blaze_ccp.middlewares=ccp_b_strip,test-auth"
+      - "traefik.http.routers.blaze_ccp.middlewares=ccp_b_strip,cpp-auth"
       - "traefik.http.routers.blaze_ccp.tls=true"
   
   ccp-search-share:
@@ -82,10 +82,10 @@ services:
       APP_STORE_BASEURL: "http://bridgehead-ccp-blaze:8080/fhir"
       SPRING_DATASOURCE_URL: "jdbc:postgresql://bridgehead-ccp-share-db:5432/dktk-fed-search-share"
       JAVA_TOOL_OPTIONS: "-Xmx1g"
-      http_proxy: "http://bridgehead-squid:3128"
-      https_proxy: "http://bridgehead-squid:3128"
-      HTTP_PROXY: "http://bridgehead-squid:3128"
-      HTTPS_PROXY: "http://bridgehead-squid:3128"
+      http_proxy: "http://bridgehead-forward-proxy:3128"
+      https_proxy: "http://bridgehead-forward-proxy:3128"
+      HTTP_PROXY: "http://bridgehead-forward-proxy:3128"
+      HTTPS_PROXY: "http://bridgehead-forward-proxy:3128"
     depends_on:
     - ccp-search-share-db
     - blaze
diff --git a/lib/generate.sh b/lib/generate.sh
index bdb8704..a4a093e 100755
--- a/lib/generate.sh
+++ b/lib/generate.sh
@@ -12,10 +12,10 @@ CENTRAL_SERVICES="          <tr>
 
 LOCAL_SERVICES="          <tr>
             <td>Bridgehead</td>
-            <td>Reverse Proxy <a href=\"http://${HOST}:8080/\">Traefik</a></td>
+            <td>Reverse Proxy <a href=\"https://${HOST}:8080/\">Traefik</a></td>
           </tr>"
 
-if [ "$project" = "dktk" ] || [ "$project" = "c4" ] || [ "$project" = "dktk-fed" ]
+if [ "$project" = "ccp" ]
 then
     CENTRAL_SERVICES+="          <tr>
             <td>CCP-IT</td>
@@ -40,11 +40,11 @@ then
           "
 fi
 
-if [ "$project" = "dktk-fed" ]
+if [ "$project" = "ccp" ]
 then 
     LOCAL_SERVICES+="         <tr>
             <td>DKTK</td>
-            <td><a href=\"https://${HOST}/dktk-localdatamanagement/fhir/\">Blaze</a></td>
+            <td><a href=\"https://${HOST}/cpp-localdatamanagement/fhir/\">Blaze</a></td>
           </tr>
           "
 fi
@@ -99,14 +99,6 @@ cat > ./landing/index.html <<EOL
         </thead>
         <tbody>
           ${LOCAL_SERVICES}
-          <tr>
-            <td>Bridgehead</td>
-            <td>Reverse Proxy <a href="https://e260-serv-05/dashboard/">Traefik</a></td>
-          </tr>
-          <tr>
-            <td>DKTK</td>
-            <td><a href="https://e260-serv-05/dktk-localdatamanagement/fhir/">Blaze</a></td>
-          </tr>
         </tbody>
       </table>
     </div>
diff --git a/lib/setup-bridgehead-units.sh b/lib/setup-bridgehead-units.sh
index d70adcd..cd37a6c 100755
--- a/lib/setup-bridgehead-units.sh
+++ b/lib/setup-bridgehead-units.sh
@@ -1,9 +1,7 @@
 #!/bin/bash
-### Note: Currently not complete, needs some features before useable for production
 
 source lib/functions.sh
 
-<<<<<<< HEAD
 exitIfNotRoot
 
 if [ $# -eq 0 ]; then
@@ -18,8 +16,6 @@ fi
 
 export project=$1
 
-=======
->>>>>>> 290fe5459d7399ff23a2a8db067c1728858350d5
 if ! ./lib/prerequisites.sh; then
     log "Prerequisites failed, exiting"
     exit 1