From 1981eb6037a89bda8c513f001e296f026887b563 Mon Sep 17 00:00:00 2001 From: enola DKFZ Date: Fri, 23 May 2025 18:12:45 +0200 Subject: [PATCH] some changes after SFTPing to my machine --- bbmri/modules/directory-sync.sh | 0 bridgehead | 0 ccp/modules/exporter-compose.yml | 14 +++++--------- ccp/modules/teiler-compose.yml | 2 +- lib/gitlab-token-helper.sh | 0 lib/install-bridgehead.sh | 0 lib/monitoring.sh | 0 lib/prepare-system.sh | 0 lib/prerequisites.sh | 0 lib/uninstall-bridgehead.sh | 0 lib/update-bridgehead.sh | 0 modules/transfair-setup.sh | 0 12 files changed, 6 insertions(+), 10 deletions(-) mode change 100755 => 100644 bbmri/modules/directory-sync.sh mode change 100755 => 100644 bridgehead mode change 100755 => 100644 lib/gitlab-token-helper.sh mode change 100755 => 100644 lib/install-bridgehead.sh mode change 100755 => 100644 lib/monitoring.sh mode change 100755 => 100644 lib/prepare-system.sh mode change 100755 => 100644 lib/prerequisites.sh mode change 100755 => 100644 lib/uninstall-bridgehead.sh mode change 100755 => 100644 lib/update-bridgehead.sh mode change 100755 => 100644 modules/transfair-setup.sh diff --git a/bbmri/modules/directory-sync.sh b/bbmri/modules/directory-sync.sh old mode 100755 new mode 100644 diff --git a/bridgehead b/bridgehead old mode 100755 new mode 100644 diff --git a/ccp/modules/exporter-compose.yml b/ccp/modules/exporter-compose.yml index 1c764b3..241b10e 100644 --- a/ccp/modules/exporter-compose.yml +++ b/ccp/modules/exporter-compose.yml @@ -18,11 +18,6 @@ services: OPAL_PASSWORD: "${EXPORTER_OPAL_PASSWORD}" labels: - "traefik.enable=true" - - "traefik.http.routers.exporter_${PLATFORM}.rule=PathPrefix(`/${PLATFORM}-exporter`)" - - "traefik.http.services.exporter_${PLATFORM}.loadbalancer.server.port=8092" - - "traefik.http.routers.exporter_${PLATFORM}.tls=true" - - "traefik.http.middlewares.exporter_${PLATFORM}_strip.stripprefix.prefixes=/${PLATFORM}-exporter" - - "traefik.http.routers.exporter_${PLATFORM}.middlewares=exporter_${PLATFORM}_strip" - "traefik.http.routers.exporter_${PLATFORM}.rule=Path(`/${PLATFORM}-exporter/`)" - "traefik.http.services.exporter_${PLATFORM}.loadbalancer.server.port=8092" - "traefik.http.routers.exporter_${PLATFORM}.tls=true" @@ -89,7 +84,8 @@ services: - "traefik.http.routers.reporter_${PLATFORM}_api.middlewares=reporter_${PLATFORM}_strip,exporter_auth" - "traefik.http.routers.reporter_${PLATFORM}_api.priority=25" - focus: - environment: - EXPORTER_URL: "http://exporter:8092" - EXPORTER_API_KEY: "${EXPORTER_API_KEY}" + +# focus: +# environment: +# EXPORTER_URL: "http://exporter:8092" +# EXPORTER_API_KEY: "${EXPORTER_API_KEY}" diff --git a/ccp/modules/teiler-compose.yml b/ccp/modules/teiler-compose.yml index 29a926a..ea4aa37 100644 --- a/ccp/modules/teiler-compose.yml +++ b/ccp/modules/teiler-compose.yml @@ -64,7 +64,7 @@ services: APPLICATION_PORT: "8085" APPLICATION_ADDRESS: "${HOST}" DEFAULT_LANGUAGE: "${DEFAULT_LANGUAGE}" - CONFIG_ENV_VAR_PATH: "/run/secrets/${PLATFORM}.conf" + CONFIG_ENV_VAR_PATH: "/run/secrets/project-conf" TEILER_ORCHESTRATOR_HTTP_RELATIVE_PATH: "/${PLATFORM}-teiler" TEILER_ORCHESTRATOR_URL: "https://${HOST}/${PLATFORM}-teiler" TEILER_DASHBOARD_DE_URL: "https://${HOST}/${PLATFORM}-teiler-dashboard/de" diff --git a/lib/gitlab-token-helper.sh b/lib/gitlab-token-helper.sh old mode 100755 new mode 100644 diff --git a/lib/install-bridgehead.sh b/lib/install-bridgehead.sh old mode 100755 new mode 100644 diff --git a/lib/monitoring.sh b/lib/monitoring.sh old mode 100755 new mode 100644 diff --git a/lib/prepare-system.sh b/lib/prepare-system.sh old mode 100755 new mode 100644 diff --git a/lib/prerequisites.sh b/lib/prerequisites.sh old mode 100755 new mode 100644 diff --git a/lib/uninstall-bridgehead.sh b/lib/uninstall-bridgehead.sh old mode 100755 new mode 100644 diff --git a/lib/update-bridgehead.sh b/lib/update-bridgehead.sh old mode 100755 new mode 100644 diff --git a/modules/transfair-setup.sh b/modules/transfair-setup.sh old mode 100755 new mode 100644