From ec1aa6ace8a96c9a5dcafbe6d1cdaeb4a155daa9 Mon Sep 17 00:00:00 2001 From: janskiba Date: Wed, 20 Nov 2024 10:59:33 +0000 Subject: [PATCH] host central targets in git --- ccp/modules/dnpm-compose.yml | 4 +- minimal/modules/dnpm-central-targets.json | 136 ++++++++++++++++++++++ minimal/modules/dnpm-compose.yml | 4 +- 3 files changed, 140 insertions(+), 4 deletions(-) create mode 100644 minimal/modules/dnpm-central-targets.json diff --git a/ccp/modules/dnpm-compose.yml b/ccp/modules/dnpm-compose.yml index c32426f4..0ce7f745 100644 --- a/ccp/modules/dnpm-compose.yml +++ b/ccp/modules/dnpm-compose.yml @@ -13,7 +13,7 @@ services: PROXY_APIKEY: ${DNPM_BEAM_SECRET_SHORT} APP_ID: dnpm-connect.${PROXY_ID} DISCOVERY_URL: "./conf/central_targets.json" - LOCAL_TARGETS_FILE: "./conf/connect_targets.json" + LOCAL_TARGETS_FILE: "/conf/connect_targets.json" HTTP_PROXY: "http://forward_proxy:3128" HTTPS_PROXY: "http://forward_proxy:3128" NO_PROXY: beam-proxy,dnpm-backend,host.docker.internal${DNPM_ADDITIONAL_NO_PROXY} @@ -25,7 +25,7 @@ services: volumes: - /etc/bridgehead/trusted-ca-certs:/conf/trusted-ca-certs:ro - /etc/bridgehead/dnpm/local_targets.json:/conf/connect_targets.json:ro - - /etc/bridgehead/dnpm/central_targets.json:/conf/central_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`)" diff --git a/minimal/modules/dnpm-central-targets.json b/minimal/modules/dnpm-central-targets.json new file mode 100644 index 00000000..e5e39e17 --- /dev/null +++ b/minimal/modules/dnpm-central-targets.json @@ -0,0 +1,136 @@ +{ + "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": "Charite", + "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.dnpm-bridge.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": "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 646a4571..1c9a36aa 100644 --- a/minimal/modules/dnpm-compose.yml +++ b/minimal/modules/dnpm-compose.yml @@ -29,7 +29,7 @@ services: 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" + 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${DNPM_ADDITIONAL_NO_PROXY} @@ -41,7 +41,7 @@ services: volumes: - /etc/bridgehead/trusted-ca-certs:/conf/trusted-ca-certs:ro - /etc/bridgehead/dnpm/local_targets.json:/conf/connect_targets.json:ro - - /etc/bridgehead/dnpm/central_targets.json:/conf/central_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`)"