From 480bbe04e75ad9453815a88ae6296862786f6f46 Mon Sep 17 00:00:00 2001 From: djuarezgf Date: Mon, 18 Mar 2024 16:47:40 +0100 Subject: [PATCH] Changed: TEILER_DEFAULT_LANGUAGE --- bbmri/modules/dnpm-compose.yml | 0 ccp/modules/teiler-compose.yml | 6 +++--- ccp/modules/teiler-setup.sh | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) delete mode 100644 bbmri/modules/dnpm-compose.yml diff --git a/bbmri/modules/dnpm-compose.yml b/bbmri/modules/dnpm-compose.yml deleted file mode 100644 index e69de29..0000000 diff --git a/ccp/modules/teiler-compose.yml b/ccp/modules/teiler-compose.yml index a76f161..f415ee9 100644 --- a/ccp/modules/teiler-compose.yml +++ b/ccp/modules/teiler-compose.yml @@ -15,7 +15,7 @@ services: environment: TEILER_BACKEND_URL: "https://${HOST}/ccp-teiler-backend" TEILER_DASHBOARD_URL: "https://${HOST}/ccp-teiler-dashboard" - DEFAULT_LANGUAGE: "${DEFAULT_LANGUAGE_LOWER_CASE}" + DEFAULT_LANGUAGE: "${TEILER_DEFAULT_LANGUAGE_LOWER_CASE}" HTTP_RELATIVE_PATH: "/ccp-teiler" teiler-dashboard: @@ -29,7 +29,7 @@ services: - "traefik.http.middlewares.teiler_dashboard_ccp_strip.stripprefix.prefixes=/ccp-teiler-dashboard" - "traefik.http.routers.teiler_dashboard_ccp.middlewares=teiler_dashboard_ccp_strip" environment: - DEFAULT_LANGUAGE: "${DEFAULT_LANGUAGE}" + DEFAULT_LANGUAGE: "${TEILER_DEFAULT_LANGUAGE}" TEILER_BACKEND_URL: "https://${HOST}/ccp-teiler-backend" OIDC_URL: "${OIDC_URL}" OIDC_REALM: "${OIDC_REALM}" @@ -63,7 +63,7 @@ services: LOG_LEVEL: "INFO" APPLICATION_PORT: "8085" APPLICATION_ADDRESS: "${HOST}" - DEFAULT_LANGUAGE: "${DEFAULT_LANGUAGE}" + DEFAULT_LANGUAGE: "${TEILER_DEFAULT_LANGUAGE}" CONFIG_ENV_VAR_PATH: "/run/secrets/ccp.conf" TEILER_ORCHESTRATOR_HTTP_RELATIVE_PATH: "/ccp-teiler" TEILER_ORCHESTRATOR_URL: "https://${HOST}/ccp-teiler" diff --git a/ccp/modules/teiler-setup.sh b/ccp/modules/teiler-setup.sh index cc561d5..eed3f81 100644 --- a/ccp/modules/teiler-setup.sh +++ b/ccp/modules/teiler-setup.sh @@ -3,7 +3,7 @@ if [ "$ENABLE_TEILER" == true ];then log INFO "Teiler setup detected -- will start Teiler services." OVERRIDE+=" -f ./$PROJECT/modules/teiler-compose.yml" - DEFAULT_LANGUAGE=DE - DEFAULT_LANGUAGE_LOWER_CASE=${DEFAULT_LANGUAGE,,} + TEILER_DEFAULT_LANGUAGE=DE + TEILER_DEFAULT_LANGUAGE_LOWER_CASE=${TEILER_DEFAULT_LANGUAGE,,} add_public_oidc_redirect_url "/ccp-teiler/*" fi