From 2eb56e66c872a256a2e81ada4f0de16b545c3e79 Mon Sep 17 00:00:00 2001 From: juarez Date: Fri, 17 Nov 2023 10:27:12 +0100 Subject: [PATCH] Integrate central Keycloak in Teiler --- ccp/modules/datashield-compose.yml | 2 +- ccp/vars | 1 + lib/functions.sh | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ccp/modules/datashield-compose.yml b/ccp/modules/datashield-compose.yml index db2760a..e3e0d01 100644 --- a/ccp/modules/datashield-compose.yml +++ b/ccp/modules/datashield-compose.yml @@ -96,7 +96,7 @@ services: networks: - default - rstudio - + traefik: networks: - default diff --git a/ccp/vars b/ccp/vars index eb998d7..eb2a1c8 100644 --- a/ccp/vars +++ b/ccp/vars @@ -10,6 +10,7 @@ BROKER_URL_FOR_PREREQ=$BROKER_URL DEFAULT_LANGUAGE=DE DEFAULT_LANGUAGE_LOWER_CASE=${DEFAULT_LANGUAGE,,} ENABLE_EXPORTER=true +ENABLE_LOGIN=true ENABLE_TEILER=true #ENABLE_DATASHIELD=true diff --git a/lib/functions.sh b/lib/functions.sh index c175fcf..d32bdbe 100644 --- a/lib/functions.sh +++ b/lib/functions.sh @@ -270,7 +270,7 @@ function sync_secrets() { if [[ $OIDC_PRIVATE_REDIRECT_URLS != "" ]]; then if [[ $secret_sync_args == "" ]]; then secret_sync_args="OIDC:OIDC_PUBLIC:public;$OIDC_PUBLIC_REDIRECT_URLS" - else + else secret_sync_args+="${delimiter}OIDC:OIDC_PUBLIC:public;$OIDC_PUBLIC_REDIRECT_URLS" fi fi @@ -282,7 +282,7 @@ function sync_secrets() { docker run --rm \ -v /var/cache/bridgehead/secrets/oidc:/usr/local/cache \ -v $PRIVATEKEYFILENAME:/run/secrets/privkey.pem:ro \ - -v /srv/docker/bridgehead/$PROJECT/root.crt.pem:/run/secrets/root.crt.pem:ro \ + -v ./$PROJECT/root.crt.pem:/run/secrets/root.crt.pem:ro \ -v /etc/bridgehead/trusted-ca-certs:/conf/trusted-ca-certs:ro \ -e TLS_CA_CERTIFICATES_DIR=/conf/trusted-ca-certs \ -e NO_PROXY=localhost,127.0.0.1 \