From 71fea9f098bc917bf0f2a5a732eeba071e8eabeb Mon Sep 17 00:00:00 2001 From: Tobias Kussel Date: Tue, 13 Jun 2023 06:16:00 +0000 Subject: [PATCH 01/12] Switch to new dktk broker url with new root cert --- ccp/root.crt.pem | 38 +++++++++++++++++++------------------- ccp/vars | 4 ++-- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/ccp/root.crt.pem b/ccp/root.crt.pem index b561218..100011d 100644 --- a/ccp/root.crt.pem +++ b/ccp/root.crt.pem @@ -1,20 +1,20 @@ -----BEGIN CERTIFICATE----- -MIIDNTCCAh2gAwIBAgIUMeGRSrNPhRdQ1tU7uK5+lUa4f38wDQYJKoZIhvcNAQEL -BQAwFjEUMBIGA1UEAxMLQnJva2VyLVJvb3QwHhcNMjIwOTI5MTQxMjU1WhcNMzIw -OTI2MTQxMzI1WjAWMRQwEgYDVQQDEwtCcm9rZXItUm9vdDCCASIwDQYJKoZIhvcN -AQEBBQADggEPADCCAQoCggEBAMYyroOUeb27mYzClOrjCmgIceLalsFA0aVCh5mZ -KtP8+1U3oq/7exP30gXiJojxW7xoerfyQY9s0Sz5YYbxYbuskFOYEtyAILB/pxgd -+k+J3tlZKolpfmo7WT5tZiHxH/zjrtAYGnuB2xPHRMCWh/tHYrELgXQuilNol24y -GBa1plTlARy0aKEDUHp87WLhD2qH7B8sFlLgo0+gunE1UtR2HMSPF45w3VXszyG6 -fJNrAj0yPnKy3Dm1BMO3jDO2e0A9lCQ71a4j4TeKePfCk1xCArSu6PpiwiacKplF -c6CRR6KrWVm2g+8Y2hFcOBG/Py2xusm3PWbpylGq6vtFRkkCAwEAAaN7MHkwDgYD -VR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFEFxD6BQwQO5 -xsJ+3cvZypsnh6dDMB8GA1UdIwQYMBaAFEFxD6BQwQO5xsJ+3cvZypsnh6dDMBYG -A1UdEQQPMA2CC0Jyb2tlci1Sb290MA0GCSqGSIb3DQEBCwUAA4IBAQB5zTeIhV/3 -3Am6O144EFtnIeaZ2w0D6aEHqHAZp50vJv3+uQfOliCOzgw7VDxI4Zz2JALjlR/i -uOYHsu3YIRMIOmPOjqrdDJa6auB0ufL4oUPfCRln7Fh0f3JVlz3BUoHsSDt949p4 -g0nnsciL2JHuzlqjn7Jyt3L7dAHrlFKulCcuidG5D3cqXrRCbF83f+k3TC/HRiNd -25oMi7I4MP/SOCdfQGUGIsHIf/0hSm3pNjDOrC/XuI/8gh2f5io+Y8V+hMwMBcm4 -JbH8bdyBB+EIhsNbTwf2MWntD5bmg47sf7hh23aNvKXI67Li1pTI2t1CqiGnFR0U -fCEpeaEAHs0k ------END CERTIFICATE----- +MIIDNTCCAh2gAwIBAgIUN7yzueIZzwpe8PaPEIMY8zoH+eMwDQYJKoZIhvcNAQEL +BQAwFjEUMBIGA1UEAxMLQnJva2VyLVJvb3QwHhcNMjMwNTIzMTAxNzIzWhcNMzMw +NTIwMTAxNzUzWjAWMRQwEgYDVQQDEwtCcm9rZXItUm9vdDCCASIwDQYJKoZIhvcN +AQEBBQADggEPADCCAQoCggEBAN5JAj+HydSGaxvA0AOcrXVTZ9FfsH0cMVBlQb72 +bGZgrRvkqtB011TNXZfsHl7rPxCY61DcsDJfFq3+8VHT+S9HE0qV1bEwP+oA3xc4 +Opq77av77cNNOqDC7h+jyPhHcUaE33iddmrH9Zn2ofWTSkKHHu3PAe5udCrc2QnD +4PLRF6gqiEY1mcGknJrXj1ff/X0nRY/m6cnHNXz0Cvh8oPOtbdfGgfZjID2/fJNP +fNoNKqN+5oJAZ+ZZ9id9rBvKj1ivW3F2EoGjZF268SgZzc5QrM/D1OpSBQf5SF/V +qUPcQTgt9ry3YR+SZYazLkfKMEOWEa0WsqJVgXdQ6FyergcCAwEAAaN7MHkwDgYD +VR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFEa70kcseqU5 +bHx2zSt4bG21HokhMB8GA1UdIwQYMBaAFEa70kcseqU5bHx2zSt4bG21HokhMBYG +A1UdEQQPMA2CC0Jyb2tlci1Sb290MA0GCSqGSIb3DQEBCwUAA4IBAQCGmE7NXW4T +6J4mV3b132cGEMD7grx5JeiXK5EHMlswUS+Odz0NcBNzhUHdG4WVMbrilHbI5Ua+ +6jdKx5WwnqzjQvElP0MCw6sH/35gbokWgk1provOP99WOFRsQs+9Sm8M2XtMf9HZ +m3wABwU/O+dhZZ1OT1PjSZD0OKWKqH/KvlsoF5R6P888KpeYFiIWiUNS5z21Jm8A +ZcllJjiRJ60EmDwSUOQVJJSMOvtr6xTZDZLtAKSN8zN08lsNGzyrFwqjDwU0WTqp +scMXEGBsWQjlvxqDnXyljepR0oqRIjOvgrWaIgbxcnu98tK/OdBGwlAPKNUW7Crr +vO+eHxl9iqd4 +-----END CERTIFICATE----- \ No newline at end of file diff --git a/ccp/vars b/ccp/vars index 5172d24..d6304f3 100644 --- a/ccp/vars +++ b/ccp/vars @@ -1,4 +1,4 @@ -BROKER_ID=broker.dev.ccp-it.dktk.dkfz.de +BROKER_ID=broker.ccp-it.dktk.dkfz.de BROKER_URL=https://${BROKER_ID} PROXY_ID=${SITE_ID}.${BROKER_ID} SPOT_BEAM_SECRET_SHORT="$(cat /proc/sys/kernel/random/uuid | sed 's/[-]//g' | head -c 20)" @@ -16,4 +16,4 @@ source $PROJECT/nngm-setup.sh nngmSetup source $PROJECT/exliquid-setup.sh exliquidSetup -mtbaSetup \ No newline at end of file +mtbaSetup From 019304862e052b5b5636cf5464c89bf25baadd1a Mon Sep 17 00:00:00 2001 From: "p.delpy@dkfz-heidelberg.de" Date: Thu, 15 Jun 2023 11:02:59 +0200 Subject: [PATCH 02/12] make ID Management skippable for MTBA --- ccp/nngm-setup.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ccp/nngm-setup.sh b/ccp/nngm-setup.sh index bcc4cd1..f2cefa9 100644 --- a/ccp/nngm-setup.sh +++ b/ccp/nngm-setup.sh @@ -15,10 +15,10 @@ function mtbaSetup() { # TODO: Check if ID-Management Module is activated! if [ -n "$ENABLE_MTBA" ];then log INFO "MTBA setup detected -- will start MTBA Service and CBioPortal." - if [ ! -n "$IDMANAGER_UPLOAD_APIKEY" ]; then - log ERROR "Detected MTBA Module configuration but ID-Management Module seems not to be configured!" - exit 1; - fi +# if [ ! -n "$IDMANAGER_UPLOAD_APIKEY" ]; then +# log ERROR "Detected MTBA Module configuration but ID-Management Module seems not to be configured!" +# exit 1; +# fi OVERRIDE+=" -f ./$PROJECT/mtba-compose.yml" fi } From 149a550940ee5818d65c282a48414ee3de4ba217 Mon Sep 17 00:00:00 2001 From: Pierre Delpy Date: Mon, 19 Jun 2023 07:24:39 +0200 Subject: [PATCH 03/12] deactivate exliquid in freiburg --- ccp/exliquid-setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccp/exliquid-setup.sh b/ccp/exliquid-setup.sh index 91909eb..353bac8 100644 --- a/ccp/exliquid-setup.sh +++ b/ccp/exliquid-setup.sh @@ -2,7 +2,7 @@ function exliquidSetup() { case ${SITE_ID} in - berlin|dresden|essen|frankfurt|freiburg|luebeck|mainz|muenchen-lmu|muenchen-tum|mannheim|tuebingen) + berlin|dresden|essen|frankfurt|luebeck|mainz|muenchen-lmu|muenchen-tum|mannheim|tuebingen) EXLIQUID=1 ;; dktk-test) From 188d8d109ec76b28552cae32c738e5f5d6e931a8 Mon Sep 17 00:00:00 2001 From: Martin Lablans Date: Mon, 19 Jun 2023 13:32:47 +0200 Subject: [PATCH 04/12] Change focus tag to main --- bbmri/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bbmri/docker-compose.yml b/bbmri/docker-compose.yml index 07658f4..e00ed67 100644 --- a/bbmri/docker-compose.yml +++ b/bbmri/docker-compose.yml @@ -72,7 +72,7 @@ services: - "traefik.http.routers.blaze_ccp.tls=true" focus: - image: docker.verbis.dkfz.de/cache/samply/focus:develop + image: docker.verbis.dkfz.de/cache/samply/focus:main container_name: bridgehead-focus environment: API_KEY: ${FOCUS_BEAM_SECRET_SHORT} From 097de416529e62fb29a19e54cd7b20c8add1a3a8 Mon Sep 17 00:00:00 2001 From: Martin Lablans Date: Mon, 19 Jun 2023 13:33:26 +0200 Subject: [PATCH 05/12] focus: Rename SECRET to API_KEY --- ccp/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccp/docker-compose.yml b/ccp/docker-compose.yml index bc462f7..624766d 100644 --- a/ccp/docker-compose.yml +++ b/ccp/docker-compose.yml @@ -75,7 +75,7 @@ services: image: docker.verbis.dkfz.de/cache/samply/focus:main container_name: bridgehead-focus environment: - SECRET: ${FOCUS_BEAM_SECRET_SHORT} + API_KEY: ${FOCUS_BEAM_SECRET_SHORT} BEAM_APP_ID_LONG: focus.${PROXY_ID} PROXY_ID: ${PROXY_ID} BLAZE_URL: "http://bridgehead-ccp-blaze:8080/fhir/" From 21fce5a058fe247add77880cd6f6a4d5ca60a344 Mon Sep 17 00:00:00 2001 From: "p.delpy@dkfz-heidelberg.de" Date: Tue, 27 Jun 2023 10:29:29 +0200 Subject: [PATCH 06/12] beam enroll use docker cache --- bridgehead | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bridgehead b/bridgehead index 056d385..59287f4 100755 --- a/bridgehead +++ b/bridgehead @@ -97,7 +97,7 @@ case "$ACTION" in ;; enroll) loadVars - docker run --rm -ti -v /etc/bridgehead/pki:/etc/bridgehead/pki samply/beam-enroll:latest --output-file $PRIVATEKEYFILENAME --proxy-id $PROXY_ID --admin-email $SUPPORT_EMAIL + docker run --rm -ti -v /etc/bridgehead/pki:/etc/bridgehead/pki docker.verbis.dkfz.de/cache/samply/beam-enroll:latest --output-file $PRIVATEKEYFILENAME --proxy-id $PROXY_ID --admin-email $SUPPORT_EMAIL chmod 600 $PRIVATEKEYFILENAME ;; preRun | preUpdate) From 9f4523cf9ed27860770c6bd7e8f64c4c4a41078c Mon Sep 17 00:00:00 2001 From: Tobias Kussel Date: Wed, 28 Jun 2023 14:55:35 +0200 Subject: [PATCH 07/12] Absolute path for beam root cert --- bbmri/docker-compose.yml | 2 +- ccp/docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bbmri/docker-compose.yml b/bbmri/docker-compose.yml index 8ad8211..07f1a2f 100644 --- a/bbmri/docker-compose.yml +++ b/bbmri/docker-compose.yml @@ -50,7 +50,7 @@ services: - "forward_proxy" volumes: - /etc/bridgehead/trusted-ca-certs:/conf/trusted-ca-certs:ro - - ./root.crt.pem:/conf/root.crt.pem:ro + - /srv/docker/bridgehead/bbmri/root.crt.pem:/conf/root.crt.pem:ro volumes: blaze-data: diff --git a/ccp/docker-compose.yml b/ccp/docker-compose.yml index 7b7e129..786acc9 100644 --- a/ccp/docker-compose.yml +++ b/ccp/docker-compose.yml @@ -52,7 +52,7 @@ services: - "forward_proxy" volumes: - /etc/bridgehead/trusted-ca-certs:/conf/trusted-ca-certs:ro - - ./root.crt.pem:/conf/root.crt.pem:ro + - /srv/docker/bridgehead/ccp/root.crt.pem:/conf/root.crt.pem:ro volumes: From 3dec0a7178634d8bd9b38f616b18c5e163bde407 Mon Sep 17 00:00:00 2001 From: Patrick Skowronek Date: Fri, 30 Jun 2023 13:31:11 +0200 Subject: [PATCH 08/12] Remove EXLIQUID --- ccp/exliquid-compose.yml | 34 ---------------------------------- ccp/exliquid-setup.sh | 19 ------------------- ccp/vars | 4 ---- 3 files changed, 57 deletions(-) delete mode 100644 ccp/exliquid-compose.yml delete mode 100644 ccp/exliquid-setup.sh diff --git a/ccp/exliquid-compose.yml b/ccp/exliquid-compose.yml deleted file mode 100644 index becf99a..0000000 --- a/ccp/exliquid-compose.yml +++ /dev/null @@ -1,34 +0,0 @@ -version: "3.7" - -services: - exliquid-task-store: - image: docker.verbis.dkfz.de/cache/samply/blaze:0.20 - container_name: bridgehead-exliquid-task-store - environment: - BASE_URL: "http://bridgehead-exliquid-task-store:8080" - JAVA_TOOL_OPTIONS: "-Xmx1g" - volumes: - - "exliquid-task-store-data:/app/data" - labels: - - "traefik.enable=false" - - exliquid-report-hub: - image: docker.verbis.dkfz.de/cache/samply/report-hub:latest - container_name: bridgehead-exliquid-report-hub - environment: - SPRING_WEBFLUX_BASE_PATH: "/exliquid" - JAVA_TOOL_OPTIONS: "-Xmx1g" - APP_BEAM_APPID: "report-hub.${PROXY_ID}" - APP_BEAM_SECRET: ${REPORTHUB_BEAM_SECRET_SHORT} - APP_BEAM_PROXY_BASEURL: http://beam-proxy:8081 - APP_TASKSTORE_BASEURL: "http://bridgehead-exliquid-task-store:8080/fhir" - APP_DATASTORE_BASEURL: http://bridgehead-ccp-blaze:8080/fhir - restart: always - labels: - - "traefik.enable=true" - - "traefik.http.routers.report-ccp.rule=PathPrefix(`/exliquid`)" - - "traefik.http.services.report-ccp.loadbalancer.server.port=8080" - - "traefik.http.routers.report-ccp.tls=true" - -volumes: - exliquid-task-store-data: \ No newline at end of file diff --git a/ccp/exliquid-setup.sh b/ccp/exliquid-setup.sh deleted file mode 100644 index 353bac8..0000000 --- a/ccp/exliquid-setup.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash - -function exliquidSetup() { - case ${SITE_ID} in - berlin|dresden|essen|frankfurt|luebeck|mainz|muenchen-lmu|muenchen-tum|mannheim|tuebingen) - EXLIQUID=1 - ;; - dktk-test) - EXLIQUID=1 - ;; - *) - EXLIQUID=0 - ;; - esac - if [[ $EXLIQUID -eq 1 ]]; then - log INFO "EXLIQUID setup detected -- will start Report-Hub." - OVERRIDE+=" -f ./$PROJECT/exliquid-compose.yml" - fi -} \ No newline at end of file diff --git a/ccp/vars b/ccp/vars index 412abf7..aee87b1 100644 --- a/ccp/vars +++ b/ccp/vars @@ -3,8 +3,6 @@ BROKER_URL=https://${BROKER_ID} PROXY_ID=${SITE_ID}.${BROKER_ID} FOCUS_BEAM_SECRET_SHORT="$(cat /proc/sys/kernel/random/uuid | sed 's/[-]//g' | head -c 20)" FOCUS_RETRY_COUNT=32 -REPORTHUB_BEAM_SECRET_SHORT="$(cat /proc/sys/kernel/random/uuid | sed 's/[-]//g' | head -c 20)" -REPORTHUB_BEAM_SECRET_LONG="ApiKey report-hub.${PROXY_ID} ${REPORTHUB_BEAM_SECRET_SHORT}" SUPPORT_EMAIL=support-ccp@dkfz-heidelberg.de PRIVATEKEYFILENAME=/etc/bridgehead/pki/${SITE_ID}.priv.pem @@ -15,8 +13,6 @@ idManagementSetup source $PROJECT/nngm-setup.sh nngmSetup -source $PROJECT/exliquid-setup.sh -exliquidSetup mtbaSetup for module in $PROJECT/modules/*.sh From 11db7e2be929697366d5ced52180d1f45030301a Mon Sep 17 00:00:00 2001 From: Patrick Skowronek Date: Fri, 30 Jun 2023 13:36:42 +0200 Subject: [PATCH 09/12] Remove ref to report-hub --- ccp/docker-compose.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/ccp/docker-compose.yml b/ccp/docker-compose.yml index 786acc9..1e5be26 100644 --- a/ccp/docker-compose.yml +++ b/ccp/docker-compose.yml @@ -41,7 +41,6 @@ services: BROKER_URL: ${BROKER_URL} PROXY_ID: ${PROXY_ID} APP_focus_KEY: ${FOCUS_BEAM_SECRET_SHORT} - APP_report-hub_KEY: ${REPORTHUB_BEAM_SECRET_SHORT} PRIVKEY_FILE: /run/secrets/proxy.pem ALL_PROXY: http://forward_proxy:3128 TLS_CA_CERTIFICATES_DIR: /conf/trusted-ca-certs From 6ad91edefb25c95abfab6aae55446c9e0b466cfe Mon Sep 17 00:00:00 2001 From: Martin Lablans <6804500+lablans@users.noreply.github.com> Date: Thu, 27 Jul 2023 09:37:19 +0200 Subject: [PATCH 10/12] Don't run Blaze in debug mode --- ccp/docker-compose.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/ccp/docker-compose.yml b/ccp/docker-compose.yml index 1e5be26..5a0db06 100644 --- a/ccp/docker-compose.yml +++ b/ccp/docker-compose.yml @@ -7,7 +7,6 @@ services: environment: BASE_URL: "http://bridgehead-ccp-blaze:8080" JAVA_TOOL_OPTIONS: "-Xmx4g" - LOG_LEVEL: "debug" ENFORCE_REFERENTIAL_INTEGRITY: "false" volumes: - "blaze-data:/app/data" From bbda5e917f25b04d436068c3c8e37057725f434d Mon Sep 17 00:00:00 2001 From: Patrick Skowronek Date: Wed, 16 Aug 2023 09:35:36 +0200 Subject: [PATCH 11/12] Cleanup --- .gitignore | 3 +++ ccp/{ => modules}/mtba-compose.yml | 0 ccp/modules/mtba-setup.sh | 13 +++++++++++++ ccp/{ => modules}/nngm-compose.yml | 0 ccp/modules/nngm-setup.sh | 8 ++++++++ ccp/nngm-setup.sh | 20 -------------------- ccp/vars | 12 ++++-------- 7 files changed, 28 insertions(+), 28 deletions(-) rename ccp/{ => modules}/mtba-compose.yml (100%) create mode 100644 ccp/modules/mtba-setup.sh rename ccp/{ => modules}/nngm-compose.yml (100%) create mode 100644 ccp/modules/nngm-setup.sh delete mode 100644 ccp/nngm-setup.sh diff --git a/.gitignore b/.gitignore index 2c4c7ec..a884b44 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,6 @@ site-config/* ## Ignore site configuration */docker-compose.override.yml + +## MAC OS +.DS_Store diff --git a/ccp/mtba-compose.yml b/ccp/modules/mtba-compose.yml similarity index 100% rename from ccp/mtba-compose.yml rename to ccp/modules/mtba-compose.yml diff --git a/ccp/modules/mtba-setup.sh b/ccp/modules/mtba-setup.sh new file mode 100644 index 0000000..561e5be --- /dev/null +++ b/ccp/modules/mtba-setup.sh @@ -0,0 +1,13 @@ +#!/bin/bash + +function mtbaSetup() { + # TODO: Check if ID-Management Module is activated! + if [ -n "$ENABLE_MTBA" ];then + log INFO "MTBA setup detected -- will start MTBA Service and CBioPortal." + if [ ! -n "$IDMANAGER_UPLOAD_APIKEY" ]; then + log ERROR "Detected MTBA Module configuration but ID-Management Module seems not to be configured!" + exit 1; + fi + OVERRIDE+=" -f ./$PROJECT/mtba-compose.yml" + fi +} \ No newline at end of file diff --git a/ccp/nngm-compose.yml b/ccp/modules/nngm-compose.yml similarity index 100% rename from ccp/nngm-compose.yml rename to ccp/modules/nngm-compose.yml diff --git a/ccp/modules/nngm-setup.sh b/ccp/modules/nngm-setup.sh new file mode 100644 index 0000000..3e31f59 --- /dev/null +++ b/ccp/modules/nngm-setup.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +function nngmSetup() { + if [ -n "$NNGM_CTS_APIKEY" ]; then + log INFO "nNGM setup detected -- will start nNGM Connector." + OVERRIDE+=" -f ./$PROJECT/modules/nngm-compose.yml" + fi + } diff --git a/ccp/nngm-setup.sh b/ccp/nngm-setup.sh deleted file mode 100644 index f9f1e70..0000000 --- a/ccp/nngm-setup.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash - -function nngmSetup() { - if [ -n "$NNGM_CTS_APIKEY" ]; then - log INFO "nNGM setup detected -- will start nNGM Connector." - OVERRIDE+=" -f ./$PROJECT/nngm-compose.yml" - fi - } - -function mtbaSetup() { - # TODO: Check if ID-Management Module is activated! - if [ -n "$ENABLE_MTBA" ];then - log INFO "MTBA setup detected -- will start MTBA Service and CBioPortal." -# if [ ! -n "$IDMANAGER_UPLOAD_APIKEY" ]; then -# log ERROR "Detected MTBA Module configuration but ID-Management Module seems not to be configured!" -# exit 1; -# fi - OVERRIDE+=" -f ./$PROJECT/mtba-compose.yml" - fi -} diff --git a/ccp/vars b/ccp/vars index 161b04e..0c80e8a 100644 --- a/ccp/vars +++ b/ccp/vars @@ -8,17 +8,13 @@ PRIVATEKEYFILENAME=/etc/bridgehead/pki/${SITE_ID}.priv.pem BROKER_URL_FOR_PREREQ=$BROKER_URL -# This will load id-management setup. Effective only if id-management configuration is defined. -source $PROJECT/modules/id-management-setup.sh -idManagementSetup -# This will load nngm setup. Effective only if nngm configuration is defined. -source $PROJECT/nngm-setup.sh -nngmSetup - -mtbaSetup for module in $PROJECT/modules/*.sh do log DEBUG "sourcing $module" source $module done + +idManagementSetup +nngmSetup +mtbaSetup \ No newline at end of file From fa973e2cfa73d417cee79ed3c19aa018f1642cd2 Mon Sep 17 00:00:00 2001 From: Patrick Skowronek Date: Wed, 16 Aug 2023 09:37:30 +0200 Subject: [PATCH 12/12] fix: path in mtba setup --- ccp/modules/mtba-setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccp/modules/mtba-setup.sh b/ccp/modules/mtba-setup.sh index 561e5be..c0834b9 100644 --- a/ccp/modules/mtba-setup.sh +++ b/ccp/modules/mtba-setup.sh @@ -8,6 +8,6 @@ function mtbaSetup() { log ERROR "Detected MTBA Module configuration but ID-Management Module seems not to be configured!" exit 1; fi - OVERRIDE+=" -f ./$PROJECT/mtba-compose.yml" + OVERRIDE+=" -f ./$PROJECT/modules/mtba-compose.yml" fi } \ No newline at end of file