From 8c5e8ed833119f7fc48162c9145c0898d376ca48 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 2 May 2022 16:19:17 +0200 Subject: [PATCH] Cleanup of old files Moved c4 and dktk to ccp --- .gitignore | 7 +- auth/dktk | 1 - c4/docker-compose.yml | 159 ----------- ccp/docker-compose.yml | 112 ++++++++ dktk-fed/docker-compose.yml | 144 ---------- dktk/docker-compose.yml | 122 -------- gbn/gbn.env.dev | 0 internal-configuration/magicpl.xml | 444 ----------------------------- internal-configuration/nginx.conf | 37 --- landing/index.html | 4 +- site-config | 1 - 11 files changed, 116 insertions(+), 915 deletions(-) delete mode 100644 auth/dktk delete mode 100644 c4/docker-compose.yml create mode 100644 ccp/docker-compose.yml delete mode 100644 dktk-fed/docker-compose.yml delete mode 100644 dktk/docker-compose.yml delete mode 100644 gbn/gbn.env.dev delete mode 100644 internal-configuration/magicpl.xml delete mode 100644 internal-configuration/nginx.conf delete mode 160000 site-config diff --git a/.gitignore b/.gitignore index 8960758..7196e2b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1,7 @@ -##Ignore site configuration -.gitmodules -site-config - ## Ignore site configuration config/**/* !config/**/*.default docker-compose.override.yml site.conf - +lading/* +certs/* \ No newline at end of file diff --git a/auth/dktk b/auth/dktk deleted file mode 100644 index c28b857..0000000 --- a/auth/dktk +++ /dev/null @@ -1 +0,0 @@ -ps:$apr1$wl54tz29$glQPyZIoNEosI0zQDHXz1. \ No newline at end of file diff --git a/c4/docker-compose.yml b/c4/docker-compose.yml deleted file mode 100644 index 1860f79..0000000 --- a/c4/docker-compose.yml +++ /dev/null @@ -1,159 +0,0 @@ -version: "3.7" -volumes: - c4-connector-db-data: - c4-connector-logs: - patientlist-db-data: - patientlist-logs: - id-manager-logs: - c4-store-db-data: - c4-store-logs: - -services: - traefik: - image: traefik:2.4 - command: - - --api.insecure=true - - --entrypoints.web.address=:80 - - --entrypoints.web-secure.address=:443 - - --providers.docker=true - ports: - - 80:80 - - 443:443 - - 8080:8080 - volumes: - - /var/run/docker.sock:/var/run/docker.sock:ro - - landing: - image: nginx:stable - volumes: - - ../landing/:/usr/share/nginx/html - labels: - - "traefik.enable=true" - - "traefik.http.routers.landing.rule=PathPrefix(`/`)" - - "traefik.http.services.landing.loadbalancer.server.port=80" - - c4-connector: - image: "samply/share-client:c4-feature-environmentPreconfigurationTorben" - environment: - POSTGRES_HOST: "c4-connector-db" - ID_MANAGER_APIKEY: ${MAGICPL_API_KEY_CONNECTOR} - POSTGRES_PASSWORD: ${CONNECTOR_POSTGRES_PASS} - HTTP_PROXY_USER: ${HTTP_PROXY_USER} - HTTP_PROXY_PASSWORD: ${HTTP_PROXY_PASSWORD} - HTTPS_PROXY_USER: ${HTTPS_PROXY_USER} - HTTPS_PROXY_PASSWORD: ${HTTPS_PROXY_PASSWORD} - LDM_URL: "${PROTOCOL}://${HOST}/c4-localdatamanagement" - POSTGRES_PASSWORD: ${CONNECTOR_POSTGRES_PASS} - env_file: - - ../site-config/c4.env - # Necessary for the connector to successful check the status of other components on the same host - extra_hosts: - - "host.docker.internal:host-gateway" - - "${HOST}:${HOSTIP}" - volumes: - - "c4-connector-logs:/usr/local/tomcat/logs" - depends_on: - - connector-db - restart: always - labels: - - "traefik.enable=true" - - "traefik.http.routers.c4_connector.rule=PathPrefix(`/c4-connector`)" - - "traefik.http.services.c4_connector.loadbalancer.server.port=8080" - - c4-connector-db: - image: postgres:10.17 - environment: - POSTGRES_DB: "share_v2" - POSTGRES_USER: "samplyweb" - POSTGRES_PASSWORD: ${CONNECTOR_POSTGRES_PASS} - volumes: - - "c4-connector-db-data:/var/lib/postgresql/data" - restart: always - - id-manager: - image: docker.verbis.dkfz.de/ccp/idmanager:bridgehead-develop - environment: - MAGICPL_SITE: ${SITE} - MAGICPL_MAINZELLISTE_API_KEY: ${MAGICPL_MAINZELLISTE_API_KEY} - MAGICPL_API_KEY: ${MAGICPL_API_KEY} - MAGICPL_API_KEY_CONNECTOR: ${MAGICPL_API_KEY_CONNECTOR} - MAGICPL_MAINZELLISTE_CENTRAL_API_KEY: ${MAGICPL_MAINZELLISTE_CENTRAL_API_KEY} - MAGICPL_CENTRAL_API_KEY: ${MAGICPL_CENTRAL_API_KEY} - MAGICPL_OIDC_CLIENT_ID: ${MAGICPL_OIDC_CLIENT_ID} - MAGICPL_OIDC_CLIENT_SECRET: ${MAGICPL_OIDC_CLIENT_SECRET} - TOMCAT_REVERSEPROXY_FQDN: "${HOST}" - HTTP_PROXY_USER: ${HTTP_PROXY_USER} - HTTP_PROXY_PASSWORD: ${HTTP_PROXY_PASSWORD} - HTTPS_PROXY_USER: ${HTTPS_PROXY_USER} - HTTPS_PROXY_PASSWORD: ${HTTPS_PROXY_PASSWORD} - env_file: - - ../site-config/dktk.env - volumes: - - "id-manager-logs:/usr/local/tomcat/logs" - depends_on: - - patientlist - labels: - - "traefik.http.routers.idmanager.rule=PathPrefix(`/ID-Manager`)" - - "traefik.http.services.idmanager.loadbalancer.server.port=8080" - - patientlist: - image: docker.verbis.dkfz.de/ccp/patientlist:bridgehead-develop - environment: - ML_SITE: ${SITE} - ML_API_KEY: ${MAGICPL_MAINZELLISTE_API_KEY} - ML_DB_PASS: ${ML_DB_PASS} - TOMCAT_REVERSEPROXY_FQDN: "${HOST}" - env_file: - - ../site-config/dktk.env - # TODO: Implement automatic seed generation in mainzelliste - - ../site-config/patientlist.env - volumes: - - "patientlist-logs:/usr/local/tomcat/logs" - labels: - - "traefik.http.routers.patientlist.rule=PathPrefix(`/Patientlist`)" - - "traefik.http.services.patientlist.loadbalancer.server.port=8080" - depends_on: - - patientlist-db - - patientlist-db: - image: postgres:13.1-alpine - environment: - POSTGRES_DB: mainzelliste - POSTGRES_USER: mainzelliste - POSTGRES_PASSWORD: ${ML_DB_PASS} - TZ: "Europe/Berlin" - volumes: - - "patientlist-db-data:/var/lib/postgresql/data" - - c4-store: - image: docker.verbis.dkfz.de/ccp/samply.store:release-5.1.2 - environment: - MDR_NAMESPACE: "adt,dktk,marker" - MDR_VALIDATION: false - DEPLOYMENT_CONTEXT: "c4-localdatamanagement" - POSTGRES_HOST: c4-store-db - POSTGRES_PORT: 5432 - POSTGRES_DB: samplystore - POSTGRES_USER: samplystore - POSTGRES_PASSWORD: ${STORE_POSTGRES_PASS} - TZ: "Europe/Berlin" - volumes: - - "c4-store-logs:/usr/local/tomcat/logs" - labels: - - "traefik.enable=true" - - "traefik.http.routers.store_c4.rule=PathPrefix(`/c4-localdatamanagement`)" - depends_on: - - store-db - restart: always - - c4-store-db: - image: postgres:9.5-alpine - command: postgres -c datestyle='iso, dmy' - environment: - TZ: "Europe/Berlin" - POSTGRES_DB: samplystore - POSTGRES_USER: samplystore - POSTGRES_PASSWORD: ${STORE_POSTGRES_PASS} - volumes: - - "c4-store-db-data:/var/lib/postgresql/data" - restart: always diff --git a/ccp/docker-compose.yml b/ccp/docker-compose.yml new file mode 100644 index 0000000..9973bfd --- /dev/null +++ b/ccp/docker-compose.yml @@ -0,0 +1,112 @@ +version: "3.7" + +services: + ### Does not need proxy settings + traefik: + container_name: bridgehead-traefik + image: traefik:2.4 + command: + - --entrypoints.web.address=:80 + - --entrypoints.websecure.address=:443 + - --providers.docker=true + - --api.dashboard=true + - --accesslog=true # print access-logs + - --entrypoints.web.http.redirections.entrypoint.to=websecure + - --entrypoints.web.http.redirections.entrypoint.scheme=https + labels: + - "traefik.http.routers.dashboard.rule=PathPrefix(`/api`) || PathPrefix(`/dashboard`)" + - "traefik.http.routers.dashboard.entrypoints=websecure" + - "traefik.http.routers.dashboard.service=api@internal" + - "traefik.http.routers.dashboard.tls=true" + - "traefik.http.routers.dashboard.middlewares=auth" + - "traefik.http.middlewares.auth.basicauth.users=${bc_auth_users}" + ports: + - 80:80 + - 443:443 + volumes: + - ../certs:/tools/certs + - /var/run/docker.sock:/var/run/docker.sock:ro + extra_hosts: + - "host.docker.internal:host-gateway" + + + ### Does need to know the outside proxy to connect central components + forward_proxy: + container_name: bridgehead-squid + image: ubuntu/squid + environment: + http_proxy: ${http_proxy} + https_proxy: ${https_proxy} + volumes: + - "bridgehead-proxy:/var/log/squid" + +## Needs internal proxy config + landing: + container_name: bridgehead-landingpage + image: nginx:stable + volumes: + - ../landing/:/usr/share/nginx/html + labels: + - "traefik.enable=true" + - "traefik.http.routers.landing.rule=PathPrefix(`/`)" + - "traefik.http.services.landing.loadbalancer.server.port=80" + - "traefik.http.routers.landing.tls=true" + +## Needs internal proxy config + blaze: + image: "samply/blaze:0.17" + container_name: bridgehead-ccp-blaze + environment: + BASE_URL: "http://blaze:8080" + JAVA_TOOL_OPTIONS: "-Xmx4g" + LOG_LEVEL: "debug" + ENFORCE_REFERENTIAL_INTEGRITY: "false" + volumes: + - "blaze-data:/app/data" + labels: + - "traefik.enable=true" + - "traefik.http.middlewares.test-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.tls=true" + + ccp-search-share: + image: "ghcr.io/samply/dktk-fed-search-share:main" + container_name: bridgehead_ccp_share + environment: + APP_BASE_URL: "http://dktk-fed-search-share:8080" + APP_BROKER_BASEURL: "http://dktk-fed-search.verbis.dkfz.de/broker/rest/searchbroker" + APP_BROKER_MAIL: "foo@bar.de" + APP_STORE_BASEURL: "http://bridgehead-dktk-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" + depends_on: + - ccp-search-share-db + - blaze + labels: + - "traefik.enable=true" + - "traefik.http.routers.dktk-fed-search.rule=PathPrefix(`/dktk-connector`)" + - "traefik.http.services.dktk-fed-search.loadbalancer.server.port=8080" + extra_hosts: + - "dktk-fed-search.verbis.dkfz.de:10.133.193.8" + + ccp-search-share-db: + image: "postgres:14" + container_name: bridgehead_ccp_share_db + environment: + POSTGRES_USER: "dktk-fed-search-share" + POSTGRES_PASSWORD: "dktk-fed-search-share" + POSTGRES_DB: "dktk-fed-search-share" + volumes: + - "ccp-search-share-db-data:/var/lib/postgresql/data" + +volumes: + blaze-data: + bridgehead-proxy: + ccp-search-share-db-data: \ No newline at end of file diff --git a/dktk-fed/docker-compose.yml b/dktk-fed/docker-compose.yml deleted file mode 100644 index 408066a..0000000 --- a/dktk-fed/docker-compose.yml +++ /dev/null @@ -1,144 +0,0 @@ -version: "3.7" - -services: - ### Does not need proxy settings - traefik: - container_name: bridgehead-traefik - image: traefik:2.4 - command: - - --entrypoints.web.address=:80 - - --entrypoints.websecure.address=:443 - - --providers.docker=true - - --api.dashboard=true - - --accesslog=true # print access-logs - - --entrypoints.web.http.redirections.entrypoint.to=websecure - - --entrypoints.web.http.redirections.entrypoint.scheme=https - labels: - - "traefik.http.routers.dashboard.rule=PathPrefix(`/api`) || PathPrefix(`/dashboard`)" - - "traefik.http.routers.dashboard.entrypoints=websecure" - - "traefik.http.routers.dashboard.service=api@internal" - - "traefik.http.routers.dashboard.tls=true" - - "traefik.http.routers.dashboard.middlewares=auth" - - "traefik.http.middlewares.auth.basicauth.users=${bc_auth_users}" - ports: - - 80:80 - - 443:443 - volumes: - - ../certs:/tools/certs - - /var/run/docker.sock:/var/run/docker.sock:ro - extra_hosts: - - "host.docker.internal:host-gateway" - - - ### Does need to know the outside proxy to connect central components - forward_proxy: - container_name: bridgehead-squid - image: ubuntu/squid - environment: - http_proxy: ${http_proxy} - https_proxy: ${https_proxy} - volumes: - - "bridgehead-proxy:/var/log/squid" - -## Needs internal proxy config - landing: - container_name: bridgehead-landingpage - image: nginx:stable - volumes: - - ../landing/:/usr/share/nginx/html - labels: - - "traefik.enable=true" - - "traefik.http.routers.landing.rule=PathPrefix(`/`)" - - "traefik.http.services.landing.loadbalancer.server.port=80" - - "traefik.http.routers.landing.tls=true" - -## Needs internal proxy config - blaze: - image: "samply/blaze:0.16" - container_name: bridgehead-dktk-blaze - environment: - BASE_URL: "http://blaze:8080" - JAVA_TOOL_OPTIONS: "-Xmx4g" - LOG_LEVEL: "debug" - ENFORCE_REFERENTIAL_INTEGRITY: "false" - volumes: - - "blaze-data:/app/data" - labels: - - "traefik.enable=true" - - "traefik.http.middlewares.test-auth.basicauth.users=${bc_auth_users}" - - "traefik.http.routers.blaze_dktk.rule=PathPrefix(`/dktk-localdatamanagement`)" - - "traefik.http.middlewares.dktk_b_strip.stripprefix.prefixes=/dktk-localdatamanagement" - - "traefik.http.services.blaze_dktk.loadbalancer.server.port=8080" - - "traefik.http.routers.blaze_dktk.middlewares=dktk_b_strip,test-auth" - - "traefik.http.routers.blaze_dktk.tls=true" - - - dktk-connector: - image: "samply/share-client:gbn-feature-environmentPreconfiguration" - environment: - POSTGRES_HOST: "dktk-connector-db" - POSTGRES_PASSWORD: "123" - STORE_URL: "http://bridgehead-blaze:8080/fhir" - MDR_URL: "https://mdr.ccp-it.dktk.dkfz.de/v3/api/mdr" - DEPLOYMENT_CONTEXT: "dktk-connector" - volumes: - - "dktk-connector-logs:/usr/local/tomcat/logs" - labels: - - "traefik.enable=true" - - "traefik.http.routers.dktk_connector.rule=PathPrefix(`/dktk-connector`)" - - "traefik.http.services.dktk_connector.loadbalancer.server.port=8080" - - "traefik.http.routers.landing.tls=true" - - depends_on: - - "dktk-connector-db" - - "forward_proxy" - restart: "always" - - dktk-connector-db: - image: "postgres:10.17" - environment: - POSTGRES_DB: "samply.connector" - POSTGRES_USER: "samply" - POSTGRES_PASSWORD: "123" - volumes: - - "dktk-connector-db-data:/var/lib/postgresql/data" - restart: "always" - - - # dktk-fed-search-share: - # image: "ghcr.io/samply/dktk-fed-search-share:pr-1" - # container_name: bridgehead_dktk_share - # environment: - # APP_BASE_URL: "http://dktk-fed-search-share:8080" - # APP_STORE_URL: "http://blaze:8080/fhir" - # APP_BROKER_BASEURL: "http://e260-serv-11.inet.dkfz-heidelberg.de:8080/broker/rest/searchbroker" - # APP_BROKER_MAIL: "foo@bar.de" - # APP_STORE_BASEURL: "http://bridgehead_dktk_blaze:8080/fhir" - # SPRING_DATASOURCE_URL: "jdbc:postgresql://dktk-fed-search-share-db:5432/dktk-fed-search-share" - # JAVA_TOOL_OPTIONS: "-Xmx1g" - # http_proxy: "http://www-int2.inet.dkfz-heidelberg.de:3128" - # https_proxy: "http://www-int2.inet.dkfz-heidelberg.de:3128" - # HTTP_PROXY: "http://www-int2.inet.dkfz-heidelberg.de:3128" - # HTTPS_PROXY: "http://www-int2.inet.dkfz-heidelberg.de:3128" - # depends_on: - # - dktk-fed-search-share-db - # - blaze - # labels: - # - "traefik.enable=true" - # - "traefik.http.routers.dktk-fed-search.rule=PathPrefix(`/dktk-connector`)" - # - "traefik.http.services.dktk-fed-search.loadbalancer.server.port=8080" - - # dktk-fed-search-share-db: - # image: "postgres:14" - # environment: - # POSTGRES_USER: "dktk-fed-search-share" - # POSTGRES_PASSWORD: "dktk-fed-search-share" - # POSTGRES_DB: "dktk-fed-search-share" - # volumes: - # - "dktk-fed-search-share-db-data:/var/lib/postgresql/data" - -volumes: - blaze-data: - dktk-connector-logs: - dktk-connector-db-data: - # dktk-fed-search-share-db-data: \ No newline at end of file diff --git a/dktk/docker-compose.yml b/dktk/docker-compose.yml deleted file mode 100644 index e229586..0000000 --- a/dktk/docker-compose.yml +++ /dev/null @@ -1,122 +0,0 @@ -version: "3.7" -volumes: - dktk-connector-db-data: - dktk-connector-logs: - patientlist-db-data: - patientlist-logs: - id-manager-logs: - -services: - traefik: - image: traefik:2.4 - command: - - --api.insecure=true - - --entrypoints.web.address=:80 - - --entrypoints.web-secure.address=:443 - - --providers.docker=true - ports: - - 80:80 - - 443:443 - - 8080:8080 - volumes: - - /var/run/docker.sock:/var/run/docker.sock:ro - - landing: - image: nginx:stable - volumes: - - ../landing/:/usr/share/nginx/html - labels: - - "traefik.enable=true" - - "traefik.http.routers.landing.rule=PathPrefix(`/`)" - - "traefik.http.services.landing.loadbalancer.server.port=80" - - dktk-connector: - image: "samply/share-client:dktk-feature-environmentPreconfigurationTorben" - environment: - POSTGRES_HOST: "dktk-connector-db" - ID_MANAGER_APIKEY: ${MAGICPL_API_KEY_CONNECTOR} - POSTGRES_PASSWORD: ${CONNECTOR_POSTGRES_PASS} - HTTP_PROXY_USER: ${HTTP_PROXY_USER} - HTTP_PROXY_PASSWORD: ${HTTP_PROXY_PASSWORD} - HTTPS_PROXY_USER: ${HTTPS_PROXY_USER} - HTTPS_PROXY_PASSWORD: ${HTTPS_PROXY_PASSWORD} - env_file: - - ../site-config/dktk.env - # Necessary for the connector to successful check the status of other components on the same host - extra_hosts: - - "host.docker.internal:host-gateway" - - "${HOST}:${HOSTIP}" - volumes: - - "dktk-connector-logs:/usr/local/tomcat/logs" - depends_on: - - connector-db - restart: always - labels: - - "traefik.enable=true" - - "traefik.http.routers.dktk_connector.rule=PathPrefix(`/dktk-connector`)" - - "traefik.http.services.dktk_connector.loadbalancer.server.port=8080" - - dktk-connector-db: - image: postgres:10.17 - environment: - POSTGRES_DB: "share_v2" - POSTGRES_USER: "samplyweb" - POSTGRES_PASSWORD: ${CONNECTOR_POSTGRES_PASS} - volumes: - - "dktk-connector-db-data:/var/lib/postgresql/data" - restart: always - - id-manager: - image: docker.verbis.dkfz.de/ccp/idmanager:bridgehead-develop - environment: - MAGICPL_SITE: ${SITE} - MAGICPL_MAINZELLISTE_API_KEY: ${MAGICPL_MAINZELLISTE_API_KEY} - MAGICPL_API_KEY: ${MAGICPL_API_KEY} - MAGICPL_API_KEY_CONNECTOR: ${MAGICPL_API_KEY_CONNECTOR} - MAGICPL_MAINZELLISTE_CENTRAL_API_KEY: ${MAGICPL_MAINZELLISTE_CENTRAL_API_KEY} - MAGICPL_CENTRAL_API_KEY: ${MAGICPL_CENTRAL_API_KEY} - MAGICPL_OIDC_CLIENT_ID: ${MAGICPL_OIDC_CLIENT_ID} - MAGICPL_OIDC_CLIENT_SECRET: ${MAGICPL_OIDC_CLIENT_SECRET} - TOMCAT_REVERSEPROXY_FQDN: "${HOST}" - HTTP_PROXY_USER: ${HTTP_PROXY_USER} - HTTP_PROXY_PASSWORD: ${HTTP_PROXY_PASSWORD} - HTTPS_PROXY_USER: ${HTTPS_PROXY_USER} - HTTPS_PROXY_PASSWORD: ${HTTPS_PROXY_PASSWORD} - env_file: - - ../site-config/dktk.env - volumes: - - "id-manager-logs:/usr/local/tomcat/logs" - depends_on: - - patientlist - labels: - - "traefik.http.routers.id-manager.rule=PathPrefix(`/ID-Manager`)" - - "traefik.http.services.id-manager.loadbalancer.server.port=8080" - - patientlist: - image: docker.verbis.dkfz.de/ccp/patientlist:bridgehead-develop - environment: - ML_SITE: ${SITE} - ML_API_KEY: ${MAGICPL_MAINZELLISTE_API_KEY} - ML_DB_PASS: ${ML_DB_PASS} - TOMCAT_REVERSEPROXY_FQDN: "${HOST}" - env_file: - - ../site-config/dktk.env - # TODO: Implement automatic seed generation in mainzelliste - - ../site-config/patientlist.env - volumes: - - "patientlist-logs:/usr/local/tomcat/logs" - labels: - - "traefik.http.routers.patientlist.rule=PathPrefix(`/Patientlist`)" - - "traefik.http.services.patientlist.loadbalancer.server.port=8080" - depends_on: - - patientlist-db - - patientlist-db: - image: postgres:13.1-alpine - environment: - POSTGRES_DB: mainzelliste - POSTGRES_USER: mainzelliste - POSTGRES_PASSWORD: ${ML_DB_PASS} - TZ: "Europe/Berlin" - volumes: - - "patientlist-db-data:/var/lib/postgresql/data" diff --git a/gbn/gbn.env.dev b/gbn/gbn.env.dev deleted file mode 100644 index e69de29..0000000 diff --git a/internal-configuration/magicpl.xml b/internal-configuration/magicpl.xml deleted file mode 100644 index 7d5d4d4..0000000 --- a/internal-configuration/magicpl.xml +++ /dev/null @@ -1,444 +0,0 @@ - - - - - - - - - - -]> - - - - getId - - - - - - - - - - - - - getRequestedId - - - - - - - - - - - - - - - consented - - - - - - getDktkIdWithIdat - - - - - - - - - - - - - - getIdToken - - - ¢ralKNEUrl;/paths/getIdToken - POST - ¢ralKNEApiKey; - BK_&site;_L-ID - locallyUniqueId - - - - - - - - - - de.pseudonymisierung.magicpl.processor.PathClient - - - getDktkId - - ¢ralPatientListUrl; - ¢ralPatientListApiKey; - 3.2 - - - - - - - - - de.pseudonymisierung.magicpl.processor.MainzellisteClient - - - mapIdStringToExternalId - - ids->extIDs - - - - - - - - de.pseudonymisierung.magicpl.processor.InputMapperProcessor - - - getLocalTKTExternalId - - &localPatientListUrl; - &localPatientlistApiKey; - plain - - - - - - - - - - - - - de.pseudonymisierung.magicpl.processor.MainzellisteKNTicketClient - - - generateLocalIdExternalId - - &localPatientListUrl; - &localPatientlistApiKey; - 3.2 - BK_&site;_L-ID - - - - - - - - - - de.pseudonymisierung.magicpl.processor.MainzellisteClient - - - - - - getLocalIdWithIDAT - - - - - - - - - - - getTKT - - &localPatientListUrl; - &localPatientlistApiKey; - plain - - - - - - - - - - - de.pseudonymisierung.magicpl.processor.MainzellisteKNTicketClient - - - generateLocalId - - &localPatientListUrl; - &localPatientlistApiKey; - 3.2 - BK_&site;_L-ID - - - - - - - - - de.pseudonymisierung.magicpl.processor.MainzellisteClient - - - - - - - - readPatients - - - - - - - - - - DecideLocalOrCentralRequest - - - - - - - - - - - - MDS_\*_G-ID - resultIds - - - - - readPatientsCentrally - - - - - - - - - - createReadTokenCentral - - ¢ralPatientListUrl; - ¢ralPatientListApiKey; - true - - - - - - - - - - de.pseudonymisierung.magicpl.processor.MainzellisteReadTokenClient - - - resolveReadTokenCentral - - ¢ralPatientListUrl; - ¢ralPatientListApiKey; - - - - - - - - de.pseudonymisierung.magicpl.processor.MainzellisteReadClient - - - - - - readPatientsLocally - - - - - - - - - - createReadToken - - &localPatientListUrl; - &localPatientlistApiKey; - true - - - - - - - - - - de.pseudonymisierung.magicpl.processor.MainzellisteReadTokenClient - - - resolveReadToken - - &localPatientListUrl; - &localPatientlistApiKey; - - - - - - - - de.pseudonymisierung.magicpl.processor.MainzellisteReadClient - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - getId - - - - - DKTK000001950_&site;_L-ID - DKTK000001950_&site;_G-ID - - - - - DKTK000001950_USER - - - getId - - - - - DKTK000001951_&site;_L-ID - DKTK000001951_&site;_G-ID - - - - - DKTK000001951_USER - - - getId - - - - - DKTK000001985_&site;_L-ID - DKTK000001985_&site;_G-ID - - - - - DKTK000001985_USER - - - getId - - - - - DKTK000001986_&site;_L-ID - DKTK000001986_&site;_G-ID - - - - - DKTK000001986_USER - - - getId - - - - - DKTK999999999_&site;_L-ID - DKTK999999999_&site;_G-ID - - - - - DKTK999999999_USER - - - getId - - - - - DKTK000002089_&site;_L-ID - DKTK000002089_&site;_G-ID - - - - - DKTK000002089_USER - - - getId - &magicplApiKey; - - - readPatients - &magicplApiKeyConnector; - - - diff --git a/internal-configuration/nginx.conf b/internal-configuration/nginx.conf deleted file mode 100644 index c225894..0000000 --- a/internal-configuration/nginx.conf +++ /dev/null @@ -1,37 +0,0 @@ -# Konfiguration for the bridgehead - server { - - # this is the internal Docker DNS, cache only for 30s - resolver 127.0.0.11 valid=30s; - - listen 80; - listen [::]:80; - - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Host $proxy_host; - proxy_set_header X-Forwarded-Proto $scheme; - - ### Defining the urls like this, will stop nginx from failing on startup if one service isn't started. - set $internal_connector_url http://connector:8080; - set $internal_idmanager_url http://idmanager:8080; - set $internal_patientlist_url http://patientlist:8080; - set $internal_ldm_url http://ldm:8080; - - location / { - proxy_pass $internal_connector_url; - } - - location /ID-Manager/ { - proxy_pass $internal_idmanager_url; - } - - location /Patientlist/ { - proxy_pass $internal_patientlist_url; - } - - location /LocalDatamanagement/ { - proxy_pass $internal_ldm_url; - } - } diff --git a/landing/index.html b/landing/index.html index fe6ebdf..73d2113 100644 --- a/landing/index.html +++ b/landing/index.html @@ -67,11 +67,11 @@ Bridgehead - Reverse Proxy Traefik + Reverse Proxy Traefik DKTK - Blaze + Blaze diff --git a/site-config b/site-config deleted file mode 160000 index cef02f0..0000000 --- a/site-config +++ /dev/null @@ -1 +0,0 @@ -Subproject commit cef02f04b52f4984e0a10560e0335f5248dde9c5