diff --git a/ccp/modules/dnpm-compose.yml b/ccp/modules/dnpm-compose.yml index 0ce7f745..a1b2d245 100644 --- a/ccp/modules/dnpm-compose.yml +++ b/ccp/modules/dnpm-compose.yml @@ -12,7 +12,7 @@ services: PROXY_URL: http://beam-proxy:8081 PROXY_APIKEY: ${DNPM_BEAM_SECRET_SHORT} APP_ID: dnpm-connect.${PROXY_ID} - DISCOVERY_URL: "./conf/central_targets.json" + DISCOVERY_URL: "http://dnpm-broker-connector:8080/sites" LOCAL_TARGETS_FILE: "/conf/connect_targets.json" HTTP_PROXY: "http://forward_proxy:3128" HTTPS_PROXY: "http://forward_proxy:3128" @@ -25,7 +25,6 @@ services: volumes: - /etc/bridgehead/trusted-ca-certs:/conf/trusted-ca-certs:ro - /etc/bridgehead/dnpm/local_targets.json:/conf/connect_targets.json:ro - - /srv/docker/bridgehead/minimal/modules/dnpm-central-targets.json:/conf/central_targets.json:ro labels: - "traefik.enable=true" - "traefik.http.routers.dnpm-connect.rule=PathPrefix(`/dnpm-connect`)" @@ -34,6 +33,16 @@ services: - "traefik.http.services.dnpm-connect.loadbalancer.server.port=8062" - "traefik.http.routers.dnpm-connect.tls=true" + dnpm-broker-connector: + image: samply/dnpm-broker-connector:main + container_name: bridgehead-dnpm-broker-connector + command: serve-sites + environment: + BEAM_CONNECT_URL: "http://dnpm-beam-connect:8062" + BEAM_CONNECT_HOST: "${DNPM_BEAM_CONNECT_HOST}" + DNPM_BROKER_BEAM_ID: "dnpm-connect.dnpm-bridge.${BROKER_ID}" + DNPM_BROKER_VHOST: "dnpm.de" + dnpm-echo: image: docker.verbis.dkfz.de/cache/samply/bridgehead-echo:latest container_name: bridgehead-dnpm-echo diff --git a/ccp/modules/dnpm-setup.sh b/ccp/modules/dnpm-setup.sh index 9ca47678..369cd535 100644 --- a/ccp/modules/dnpm-setup.sh +++ b/ccp/modules/dnpm-setup.sh @@ -12,4 +12,9 @@ if [ -n "${ENABLE_DNPM}" ]; then else DNPM_ADDITIONAL_NO_PROXY="" fi + if [ -n "${ENABLE_DNPM_NODE}" ]; then + DNPM_BEAM_CONNECT_HOST="${DNPM_BEAM_CONNECT_HOST:-$HOST}" + else + DNPM_BEAM_CONNECT_HOST="dnpm-beam-connect:8062" + fi fi diff --git a/minimal/modules/dnpm-central-targets.json b/minimal/modules/dnpm-central-targets.json deleted file mode 100644 index 9b28c373..00000000 --- a/minimal/modules/dnpm-central-targets.json +++ /dev/null @@ -1,142 +0,0 @@ -{ - "sites": [ - { - "id": "UKFR", - "name": "Freiburg", - "virtualhost": "ukfr.dnpm.de", - "beamconnect": "dnpm-connect.dnpm-bridge.broker.ccp-it.dktk.dkfz.de" - }, - { - "id": "UKHD", - "name": "Heidelberg", - "virtualhost": "ukhd.dnpm.de", - "beamconnect": "dnpm-connect.dnpm-bridge.broker.ccp-it.dktk.dkfz.de" - }, - { - "id": "UKT", - "name": "Tübingen", - "virtualhost": "ukt.dnpm.de", - "beamconnect": "dnpm-connect.dnpm-bridge.broker.ccp-it.dktk.dkfz.de" - }, - { - "id": "UKU", - "name": "Ulm", - "virtualhost": "uku.dnpm.de", - "beamconnect": "dnpm-connect.dnpm-bridge.broker.ccp-it.dktk.dkfz.de" - }, - { - "id": "UM", - "name": "Mainz", - "virtualhost": "um.dnpm.de", - "beamconnect": "dnpm-connect.dnpm-bridge.broker.ccp-it.dktk.dkfz.de" - }, - { - "id": "UKMR", - "name": "Marburg", - "virtualhost": "ukmr.dnpm.de", - "beamconnect": "dnpm-connect.dnpm-bridge.broker.ccp-it.dktk.dkfz.de" - }, - { - "id": "UKE", - "name": "Hamburg", - "virtualhost": "uke.dnpm.de", - "beamconnect": "dnpm-connect.dnpm-bridge.broker.ccp-it.dktk.dkfz.de" - }, - { - "id": "UKA", - "name": "Aachen", - "virtualhost": "uka.dnpm.de", - "beamconnect": "dnpm-connect.dnpm-bridge.broker.ccp-it.dktk.dkfz.de" - }, - { - "id": "Charité", - "name": "Berlin", - "virtualhost": "charite.dnpm.de", - "beamconnect": "dnpm-connect.berlin-test.broker.ccp-it.dktk.dkfz.de" - }, - { - "id": "MRI", - "name": "Muenchen-tum", - "virtualhost": "mri.dnpm.de", - "beamconnect": "dnpm-connect.muenchen-tum.broker.ccp-it.dktk.dkfz.de" - }, - { - "id": "KUM", - "name": "Muenchen-lmu", - "virtualhost": "kum.dnpm.de", - "beamconnect": "dnpm-connect.muenchen-lmu.broker.ccp-it.dktk.dkfz.de" - }, - { - "id": "MHH", - "name": "Hannover", - "virtualhost": "mhh.dnpm.de", - "beamconnect": "dnpm-connect.hannover.broker.ccp-it.dktk.dkfz.de" - }, - { - "id": "UKDD", - "name": "dresden-dnpm", - "virtualhost": "ukdd.dnpm.de", - "beamconnect": "dnpm-connect.dresden-dnpm.broker.ccp-it.dktk.dkfz.de" - }, - { - "id": "UKB", - "name": "Bonn", - "virtualhost": "ukb.dnpm.de", - "beamconnect": "dnpm-connect.bonn-dnpm.broker.ccp-it.dktk.dkfz.de" - }, - { - "id": "UKD", - "name": "Duesseldorf", - "virtualhost": "ukd.dnpm.de", - "beamconnect": "dnpm-connect.duesseldorf-dnpm.broker.ccp-it.dktk.dkfz.de" - }, - { - "id": "UKK", - "name": "Koeln", - "virtualhost": "ukk.dnpm.de", - "beamconnect": "dnpm-connect.dnpm-bridge.broker.ccp-it.dktk.dkfz.de" - }, - { - "id": "UME", - "name": "Essen", - "virtualhost": "ume.dnpm.de", - "beamconnect": "dnpm-connect.essen.broker.ccp-it.dktk.dkfz.de" - }, - { - "id": "UKM", - "name": "Muenster", - "virtualhost": "ukm.dnpm.de", - "beamconnect": "dnpm-connect.muenster-dnpm.broker.ccp-it.dktk.dkfz.de" - }, - { - "id": "UKF", - "name": "Frankfurt", - "virtualhost": "ukf.dnpm.de", - "beamconnect": "dnpm-connect.frankfurt.broker.ccp-it.dktk.dkfz.de" - }, - { - "id": "UMG", - "name": "Goettingen", - "virtualhost": "umg.dnpm.de", - "beamconnect": "dnpm-connect.goettingen.broker.ccp-it.dktk.dkfz.de" - }, - { - "id": "UKW", - "name": "Würzburg", - "virtualhost": "ukw.dnpm.de", - "beamconnect": "dnpm-connect.wuerzburg-dnpm.broker.ccp-it.dktk.dkfz.de" - }, - { - "id": "UKSH", - "name": "Schleswig-Holstein", - "virtualhost": "uksh.dnpm.de", - "beamconnect": "dnpm-connect.uksh-dnpm.broker.ccp-it.dktk.dkfz.de" - }, - { - "id": "TKT", - "name": "Test", - "virtualhost": "tkt.dnpm.de", - "beamconnect": "dnpm-connect.tobias-develop.broker.ccp-it.dktk.dkfz.de" - } - ] -} diff --git a/minimal/modules/dnpm-compose.yml b/minimal/modules/dnpm-compose.yml index 1c9a36aa..084add1e 100644 --- a/minimal/modules/dnpm-compose.yml +++ b/minimal/modules/dnpm-compose.yml @@ -28,7 +28,7 @@ services: 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" + DISCOVERY_URL: "http://dnpm-broker-connector:8080/sites" LOCAL_TARGETS_FILE: "/conf/connect_targets.json" HTTP_PROXY: http://forward_proxy:3128 HTTPS_PROXY: http://forward_proxy:3128 @@ -41,7 +41,6 @@ services: volumes: - /etc/bridgehead/trusted-ca-certs:/conf/trusted-ca-certs:ro - /etc/bridgehead/dnpm/local_targets.json:/conf/connect_targets.json:ro - - /srv/docker/bridgehead/minimal/modules/dnpm-central-targets.json:/conf/central_targets.json:ro labels: - "traefik.enable=true" - "traefik.http.routers.dnpm-connect.rule=PathPrefix(`/dnpm-connect`)" @@ -50,6 +49,16 @@ services: - "traefik.http.services.dnpm-connect.loadbalancer.server.port=8062" - "traefik.http.routers.dnpm-connect.tls=true" + dnpm-broker-connector: + image: samply/dnpm-broker-connector:main + container_name: bridgehead-dnpm-broker-connector + command: serve-sites + environment: + BEAM_CONNECT_URL: "http://dnpm-beam-connect:8062" + BEAM_CONNECT_HOST: "${DNPM_BEAM_CONNECT_HOST}" + DNPM_BROKER_BEAM_ID: "dnpm-connect.dnpm-bridge.${DNPM_BROKER_ID}" + DNPM_BROKER_VHOST: "dnpm.de" + dnpm-echo: image: docker.verbis.dkfz.de/cache/samply/bridgehead-echo:latest container_name: bridgehead-dnpm-echo diff --git a/minimal/modules/dnpm-setup.sh b/minimal/modules/dnpm-setup.sh index 98d55f13..29625faa 100644 --- a/minimal/modules/dnpm-setup.sh +++ b/minimal/modules/dnpm-setup.sh @@ -19,4 +19,9 @@ if [ -n "${ENABLE_DNPM}" ]; then else DNPM_ADDITIONAL_NO_PROXY="" fi + if [ -n "${ENABLE_DNPM_NODE}" ]; then + DNPM_BEAM_CONNECT_HOST="${DNPM_BEAM_CONNECT_HOST:-$HOST}" + else + DNPM_BEAM_CONNECT_HOST="dnpm-beam-connect:8062" + fi fi