Merge branch 'version-1' into martinsFixes

2022-05-10 09:16:47 +02:00 · 2022-05-10 09:16:47 +02:00 · d092d28980
parent 334f82661b acd6b94df6
commit d092d28980
7 changed files with 33 additions and 24 deletions
--- a/README.md
+++ b/README.md
@ -44,7 +44,7 @@ The Bridgehead has two primary components:
 * The **Blaze Store**. This is a highly responsive FHIR data store, which you will need to fill with your data via an ETL chain.
 * The **Connector**. This is the communication portal to the Sample Locator, with specially designed features that make it possible to run it behind a corporate firewall without making any compromises on security.

-#### CPP(DKTK/C4)
+#### CCP(DKTK/C4)

 TODO:

@ -79,6 +79,7 @@ For running your bridgehead we recommend the follwing Hardware:

 Before starting the installation process, please ensure that following software is available on your system:

+//Remove
 #### [Git](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git)

 To check that you have a working git installation, please run
@ -90,6 +91,8 @@ rm -rf Hello-World;
 ```
 If you see the output "Hello World!" your installation should be working.

+
+//Just install docker-compose und docker with version
 #### [Docker](https://docs.docker.com/get-docker/)

 To check your docker installation, you can try to execute dockers "Hello World" Image. The command is:
@ -149,10 +152,15 @@ sudo git clone https://github.com/samply/bridgehead.git /srv/docker/bridgehead;

 When using the systemd services we you need to create a bridgehead user for security reasons. This should be done after clone the repository. Since not all linux distros support ```adduser```, we provide a action for the systemcall ```useradd```.

+//
+
 ``` shell
 adduser --no-create-home --disabled-login --ingroup docker --gecos "" bridgehead
+```
+
+``` shell
 useradd -M -g docker -N -s /sbin/nologin bridgehead
-chown bridghead /srv/docker/bridgehead/ -R
+chown bridgehead /srv/docker/bridgehead/ -R
 ```


@ -216,7 +224,7 @@ To make the configuration effective, you need to tell systemd to reload the conf

 ``` shell
 sudo systemctl daemon-reload;
-sudo systemctl bridgehead@cpp.service;
+sudo systemctl bridgehead@ccp.service;
 ```

 ### DKTK/C4
--- a/ccp/docker-compose.yml
+++ b/ccp/docker-compose.yml
@ -3,7 +3,7 @@ version: "3.7"
 services:
  traefik:
    container_name: bridgehead-traefik
-    image: traefik:2.4
+    image: traefik:latest
    command:
      - --entrypoints.web.address=:80
      - --entrypoints.websecure.address=:443
@ -60,20 +60,20 @@ services:
    - "blaze-data:/app/data"
    labels:
      - "traefik.enable=true"
-      - "traefik.http.middlewares.cpp-auth.basicauth.users=${bc_auth_users}"
+      - "traefik.http.middlewares.ccp-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,cpp-auth"
+      - "traefik.http.routers.blaze_ccp.middlewares=ccp_b_strip,ccp-auth"
      - "traefik.http.routers.blaze_ccp.tls=true"
  
  ccp-search-share:
-    image: "ghcr.io/samply/dktk-fed-search-share:main"
+    image: "samply/dktk-fed-search-share"
    container_name: bridgehead-ccp-share
    environment:
      APP_BASE_URL: "http://dktk-fed-search-share:8080"
      APP_BROKER_BASEURL: "https://dktk-fed-search.verbis.dkfz.de/broker/rest/searchbroker"
-      APP_BROKER_MAIL: ${CCP_MAIL}
+      APP_BROKER_MAIL: ${CCP_SEARCHBROKER_USERNAME}
      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"
@ -86,7 +86,7 @@ services:
    - blaze
    labels:
      - "traefik.enable=true"
-      - "traefik.http.routers.dktk-fed-search.rule=PathPrefix(`/cpp-connector`)"
+      - "traefik.http.routers.dktk-fed-search.rule=PathPrefix(`/ccp-connector`)"
      - "traefik.http.services.dktk-fed-search.loadbalancer.server.port=8080"

  ccp-search-share-db:
--- a/gbn/docker-compose.yml
+++ b/gbn/docker-compose.yml
@ -1,4 +1,4 @@
-version: '3.4'
+version: '3.7'

 volumes:
  gbn-connector-logs:
@ -8,7 +8,7 @@ volumes:
 services:
  traefik:
    container_name: bridgehead-traefik
-    image: traefik:2.4
+    image: traefik:2
    command:
      - --entrypoints.web.address=:80
      - --entrypoints.websecure.address=:443
@ -65,11 +65,11 @@ services:
    - "blaze-data:/app/data"
    labels:
      - "traefik.enable=true"
-      - "traefik.http.middlewares.cpp-auth.basicauth.users=${bc_auth_users}"
+      - "traefik.http.middlewares.ccp-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,cpp-auth"
+      - "traefik.http.routers.blaze_ccp.middlewares=ccp_b_strip,ccp-auth"
      - "traefik.http.routers.blaze_ccp.tls=true"

  gbn-connector:
--- a/lib/add_bc_user.sh
+++ b/lib/add_bc_user.sh
@ -1,14 +1,15 @@
 #!/bin/bash -e
+source lib/functions.sh

-echo "This script add's a user with password to the bridghead"
+log "This script add's a user with password to the bridghead"

 if [ $# -eq 0 ]; then
-    echo "No arguments provided, please provide the project name"
+    log "No arguments provided, please provide the project name"
    exit 1
 fi

 if [ ! -f /etc/systemd/system/bridgehead@$1.service.d/override.conf ]; then
-    echo "Please create a Service first, with setup-bridgehead-units.sh"
+    log "Please create a Service first, with setup-bridgehead-units.sh"
    exit
 fi

--- a/lib/generate-landingpage.sh
+++ b/lib/generate-landingpage.sh
@ -40,7 +40,7 @@ then
          "
    LOCAL_SERVICES+="         <tr>
            <td>CCP</td>
-            <td><a href=\"https://${HOST}/cpp-localdatamanagement/fhir/\">Blaze</a></td>
+            <td><a href=\"https://${HOST}/ccp-localdatamanagement/fhir/\">Blaze</a></td>
          </tr>
          "
 fi
--- a/lib/remove-bridgehead-units.sh
+++ b/lib/remove-bridgehead-units.sh
@ -3,12 +3,12 @@
 source lib/functions.sh

 if [ $# -eq 0 ]; then
-    echo "Please provide a Project as argument"
+    log "Please provide a Project as argument"
    exit 1
 fi

 if [ $1 != "ccp" ] && [ $1 != "nngm" ] && [ $1 != "gbn" ]; then
-    echo "Please provide a supported project like ccp, gbn or nngm"
+    log "Please provide a supported project like ccp, gbn or nngm"
    exit 1
 fi

@ -16,7 +16,7 @@ export project=$1

 #checkRequirements // not needed when uninstalling

-echo "Stopping systemd services and removing bridgehead ..."
+log "Stopping systemd services and removing bridgehead ..."

 systemctl disable --now bridgehead@${project}.service bridgehead-update@${project}.timer bridgehead-update@${project}.service

--- a/lib/setup-bridgehead-units.sh
+++ b/lib/setup-bridgehead-units.sh
@ -5,12 +5,12 @@ source lib/functions.sh
 exitIfNotRoot

 if [ $# -eq 0 ]; then
-    echo "Please provide a Project as argument"
+    log "Please provide a Project as argument"
    exit 1
 fi

 if [ $1 != "ccp" ] && [ $1 != "nngm" ] && [ $1 != "gbn" ]; then
-    echo "Please provide a supported project like ccp, gbn or nngm"
+    log "Please provide a supported project like ccp, gbn or nngm"
    exit 1
 fi

@ -30,9 +30,9 @@ systemctl daemon-reload
 echo

 if ! systemctl is-active --quiet bridgehead@"${project}"; then
-    echo "Enabling autostart of bridgehead@${project}.service"
+    log "Enabling autostart of bridgehead@${project}.service"
    systemctl enable bridgehead@"${project}"
-    echo "Enabling nightly updates for bridgehead@${project}.service ..."
+    log "Enabling nightly updates for bridgehead@${project}.service ..."
    systemctl enable --now bridgehead-update@"${project}".timer
 fi