From f367a406bb55f9820409611d384a20f7ee50413c Mon Sep 17 00:00:00 2001 From: Martin Lablans Date: Tue, 20 Feb 2024 10:47:42 +0100 Subject: [PATCH] Remove DNPM code from BBMRI --- bbmri/modules/dnpm-compose.yml | 57 ----------------------------- bbmri/modules/dnpm-node-compose.yml | 33 ----------------- bbmri/modules/dnpm-node-setup.sh | 27 -------------- bbmri/modules/dnpm-setup.sh | 12 ------ 4 files changed, 129 deletions(-) delete mode 100644 bbmri/modules/dnpm-compose.yml delete mode 100644 bbmri/modules/dnpm-node-compose.yml delete mode 100644 bbmri/modules/dnpm-node-setup.sh delete mode 100644 bbmri/modules/dnpm-setup.sh diff --git a/bbmri/modules/dnpm-compose.yml b/bbmri/modules/dnpm-compose.yml deleted file mode 100644 index d1149bc..0000000 --- a/bbmri/modules/dnpm-compose.yml +++ /dev/null @@ -1,57 +0,0 @@ -version: "3.7" - -services: - dnpm-beam-proxy: - image: docker.verbis.dkfz.de/cache/samply/beam-proxy:develop - container_name: bridgehead-dnpm-beam-proxy - environment: - BROKER_URL: ${DNPM_BROKER_URL} - PROXY_ID: ${DNPM_PROXY_ID} - APP_dnpm-connect_KEY: ${DNPM_BEAM_SECRET_SHORT} - PRIVKEY_FILE: /run/secrets/proxy.pem - ALL_PROXY: http://forward_proxy:3128 - TLS_CA_CERTIFICATES_DIR: /conf/trusted-ca-certs - ROOTCERT_FILE: /conf/root.crt.pem - secrets: - - proxy.pem - depends_on: - - "forward_proxy" - volumes: - - /etc/bridgehead/trusted-ca-certs:/conf/trusted-ca-certs:ro - - /srv/docker/bridgehead/ccp/root.crt.pem:/conf/root.crt.pem:ro - - dnpm-beam-connect: - depends_on: [ dnpm-beam-proxy ] - image: docker.verbis.dkfz.de/cache/samply/beam-connect:develop - container_name: bridgehead-dnpm-beam-connect - environment: - PROXY_URL: http://dnpm-beam-proxy:8081 - PROXY_APIKEY: ${DNPM_BEAM_SECRET_SHORT} - APP_ID: dnpm-connect.${DNPM_PROXY_ID} - DISCOVERY_URL: "./conf/central_targets.json" - LOCAL_TARGETS_FILE: "./conf/connect_targets.json" - HTTP_PROXY: http://forward_proxy:3128 - HTTPS_PROXY: http://forward_proxy:3128 - NO_PROXY: dnpm-beam-proxy,dnpm-backend, host.docker.internal - RUST_LOG: ${RUST_LOG:-info} - NO_AUTH: "true" - extra_host: - - "host.docker.internal:host-gateway" - volumes: - - /etc/bridgehead/dnpm/local_targets.json:/conf/connect_targets.json:ro - - /etc/bridgehead/dnpm/central_targets.json:/conf/central_targets.json:ro - labels: - - "traefik.enable=true" - - "traefik.http.routers.dnpm-connect.rule=PathPrefix(`/dnpm-connect`)" - - "traefik.http.middlewares.dnpm-connect-strip.stripprefix.prefixes=/dnpm-connect" - - "traefik.http.routers.dnpm-connect.middlewares=dnpm-connect-strip" - - "traefik.http.services.dnpm-connect.loadbalancer.server.port=8062" - - "traefik.http.routers.dnpm-connect.tls=true" - - dnpm-echo: - image: docker.verbis.dkfz.de/cache/samply/bridgehead-echo:latest - container_name: bridgehead-dnpm-echo - -secrets: - proxy.pem: - file: /etc/bridgehead/pki/${SITE_ID}.priv.pem diff --git a/bbmri/modules/dnpm-node-compose.yml b/bbmri/modules/dnpm-node-compose.yml deleted file mode 100644 index 8a39223..0000000 --- a/bbmri/modules/dnpm-node-compose.yml +++ /dev/null @@ -1,33 +0,0 @@ -version: "3.7" - -services: - dnpm-backend: - image: ghcr.io/kohlbacherlab/bwhc-backend:1.0-snapshot-broker-connector - container_name: bridgehead-dnpm-backend - environment: - - ZPM_SITE=${ZPM_SITE} - volumes: - - /etc/bridgehead/dnpm:/bwhc_config:ro - - ${DNPM_DATA_DIR}:/bwhc_data - labels: - - "traefik.enable=true" - - "traefik.http.routers.bwhc-backend.rule=PathPrefix(`/bwhc`)" - - "traefik.http.services.bwhc-backend.loadbalancer.server.port=9000" - - "traefik.http.routers.bwhc-backend.tls=true" - - dnpm-frontend: - image: ghcr.io/kohlbacherlab/bwhc-frontend:2209 - container_name: bridgehead-dnpm-frontend - links: - - dnpm-backend - environment: - - NUXT_HOST=0.0.0.0 - - NUXT_PORT=8080 - - BACKEND_PROTOCOL=https - - BACKEND_HOSTNAME=$HOST - - BACKEND_PORT=443 - labels: - - "traefik.enable=true" - - "traefik.http.routers.bwhc-frontend.rule=PathPrefix(`/`)" - - "traefik.http.services.bwhc-frontend.loadbalancer.server.port=8080" - - "traefik.http.routers.bwhc-frontend.tls=true" diff --git a/bbmri/modules/dnpm-node-setup.sh b/bbmri/modules/dnpm-node-setup.sh deleted file mode 100644 index 88447ef..0000000 --- a/bbmri/modules/dnpm-node-setup.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash - -if [ -n "${ENABLE_DNPM_NODE}" ]; then - log INFO "DNPM setup detected (BwHC Node) -- will start BwHC node." - OVERRIDE+=" -f ./$PROJECT/modules/dnpm-node-compose.yml" - - # Set variables required for BwHC Node. ZPM_SITE is assumed to be set in /etc/bridgehead/.conf - DNPM_APPLICATION_SECRET="$(echo \"This is a salt string to generate one consistent password for DNPM. It is not required to be secret.\" | sha1sum | openssl pkeyutl -sign -inkey /etc/bridgehead/pki/${SITE_ID}.priv.pem | base64 | head -c 30)" - if [ -z "${ZPM_SITE+x}" ]; then - log ERROR "Mandatory variable ZPM_SITE not defined!" - exit 1 - fi - if [ -z "${DNPM_DATA_DIR+x}" ]; then - log ERROR "Mandatory variable DNPM_DATA_DIR not defined!" - exit 1 - fi - if grep -q 'traefik.http.routers.landing.rule=PathPrefix(`/landing`)' /srv/docker/bridgehead/minimal/docker-compose.override.yml 2>/dev/null; then - echo "Override of landing page url already in place" - else - echo "Adding override of landing page url" - if [ -f /srv/docker/bridgehead/minimal/docker-compose.override.yml ]; then - echo -e ' landing:\n labels:\n - "traefik.http.routers.landing.rule=PathPrefix(`/landing`)"' >> /srv/docker/bridgehead/minimal/docker-compose.override.yml - else - echo -e 'version: "3.7"\nservices:\n landing:\n labels:\n - "traefik.http.routers.landing.rule=PathPrefix(`/landing`)"' >> /srv/docker/bridgehead/minimal/docker-compose.override.yml - fi - fi -fi diff --git a/bbmri/modules/dnpm-setup.sh b/bbmri/modules/dnpm-setup.sh deleted file mode 100644 index 72f3199..0000000 --- a/bbmri/modules/dnpm-setup.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash - -if [ -n "${ENABLE_DNPM}" ]; then - log INFO "DNPM setup detected (Beam.Connect) -- will start Beam and Beam.Connect for DNPM." - OVERRIDE+=" -f ./$PROJECT/modules/dnpm-compose.yml" - - # Set variables required for Beam-Connect - DNPM_BEAM_SECRET_SHORT="$(cat /proc/sys/kernel/random/uuid | sed 's/[-]//g' | head -c 20)" - DNPM_BROKER_ID="broker.ccp-it.dktk.dkfz.de" - DNPM_BROKER_URL="https://${DNPM_BROKER_ID}" - DNPM_PROXY_ID="${SITE_ID}.${DNPM_BROKER_ID}" -fi