From e7f6c0b1a055231eba8f3f8ade668c64462f443c Mon Sep 17 00:00:00 2001 From: juarez Date: Wed, 9 Aug 2023 17:13:33 +0200 Subject: [PATCH] Add default language to ccp --- ccp/modules/teiler-ui-compose.yml | 6 +++--- ccp/vars | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ccp/modules/teiler-ui-compose.yml b/ccp/modules/teiler-ui-compose.yml index b819449..f12e1c5 100644 --- a/ccp/modules/teiler-ui-compose.yml +++ b/ccp/modules/teiler-ui-compose.yml @@ -13,7 +13,7 @@ services: environment: TEILER_CORE_URL: "https://${HOST}/ccp-teiler-core" TEILER_UI_URL: "https://${HOST}/ccp-teiler-ui" - DEFAULT_LANGUAGE: "de" + DEFAULT_LANGUAGE: "${DEFAULT_LANGUAGE_LOWER_CASE}" HTTP_RELATIVE_PATH: "/ccp-teiler" teiler-ui: @@ -27,7 +27,7 @@ services: - "traefik.http.middlewares.teiler_ui_ccp_strip.stripprefix.prefixes=/ccp-teiler-ui" - "traefik.http.routers.teiler_ui_ccp.middlewares=teiler_ui_ccp_strip" environment: - DEFAULT_LANGUAGE: "DE" + DEFAULT_LANGUAGE: "${DEFAULT_LANGUAGE}" TEILER_CORE_URL: "https://${HOST}/ccp-teiler-core" KEYCLOAK_URL: "https://${HOST}/login" KEYCLOAK_REALM: "teiler-ui" @@ -55,7 +55,7 @@ services: LOG_LEVEL: "INFO" APPLICATION_PORT: "8085" APPLICATION_ADDRESS: "${HOST}" - DEFAULT_LANGUAGE: "DE" + DEFAULT_LANGUAGE: "${DEFAULT_LANGUAGE}" CONFIG_ENV_VAR_PATH: "/run/secrets/ccp.conf" TEILER_ROOT_CONFIG_HTTP_RELATIVE_PATH: "/ccp-teiler" TEILER_ROOT_CONFIG_URL: "https://${HOST}/ccp-teiler" diff --git a/ccp/vars b/ccp/vars index b58710d..ebc76e8 100644 --- a/ccp/vars +++ b/ccp/vars @@ -7,6 +7,8 @@ SUPPORT_EMAIL=support-ccp@dkfz-heidelberg.de PRIVATEKEYFILENAME=/etc/bridgehead/pki/${SITE_ID}.priv.pem BROKER_URL_FOR_PREREQ=$BROKER_URL +DEFAULT_LANGUAGE=DE +DEFAULT_LANGUAGE_LOWER_CASE=${DEFAULT_LANGUAGE,,} for module in $PROJECT/modules/*.sh