fix: squash - undo OIDC in cce

This commit is contained in:
p.delpy@dkfz-heidelberg.de 2025-03-11 15:11:32 +01:00
parent 9c2185e68a
commit 2d6ee5b898
2 changed files with 16 additions and 6 deletions

View File

@ -31,10 +31,10 @@ services:
environment: environment:
DEFAULT_LANGUAGE: "${TEILER_DEFAULT_LANGUAGE}" DEFAULT_LANGUAGE: "${TEILER_DEFAULT_LANGUAGE}"
TEILER_BACKEND_URL: "https://${HOST}/cce-teiler-backend" TEILER_BACKEND_URL: "https://${HOST}/cce-teiler-backend"
OIDC_URL: "todo" OIDC_URL: "${OIDC_URL}"
OIDC_REALM: "todo" OIDC_REALM: "${OIDC_REALM}"
OIDC_CLIENT_ID: "todo" OIDC_CLIENT_ID: "${OIDC_PUBLIC_CLIENT_ID}"
OIDC_TOKEN_GROUP: "todo" OIDC_TOKEN_GROUP: "${OIDC_GROUP_CLAIM}"
TEILER_ADMIN_NAME: "${OPERATOR_FIRST_NAME} ${OPERATOR_LAST_NAME}" TEILER_ADMIN_NAME: "${OPERATOR_FIRST_NAME} ${OPERATOR_LAST_NAME}"
TEILER_ADMIN_EMAIL: "${OPERATOR_EMAIL}" TEILER_ADMIN_EMAIL: "${OPERATOR_EMAIL}"
TEILER_ADMIN_PHONE: "${OPERATOR_PHONE}" TEILER_ADMIN_PHONE: "${OPERATOR_PHONE}"
@ -43,8 +43,8 @@ services:
TEILER_ORCHESTRATOR_URL: "https://${HOST}/cce-teiler" TEILER_ORCHESTRATOR_URL: "https://${HOST}/cce-teiler"
TEILER_DASHBOARD_HTTP_RELATIVE_PATH: "/cce-teiler-dashboard" TEILER_DASHBOARD_HTTP_RELATIVE_PATH: "/cce-teiler-dashboard"
TEILER_ORCHESTRATOR_HTTP_RELATIVE_PATH: "/cce-teiler" TEILER_ORCHESTRATOR_HTTP_RELATIVE_PATH: "/cce-teiler"
TEILER_USER: "${todo}" TEILER_USER: "${OIDC_USER_GROUP}"
TEILER_ADMIN: "${todo}" TEILER_ADMIN: "${OIDC_ADMIN_GROUP}"
REPORTER_DEFAULT_TEMPLATE_ID: "cce-qb" REPORTER_DEFAULT_TEMPLATE_ID: "cce-qb"
EXPORTER_DEFAULT_TEMPLATE_ID: "cce" EXPORTER_DEFAULT_TEMPLATE_ID: "cce"

View File

@ -9,6 +9,16 @@ BROKER_URL_FOR_PREREQ=$BROKER_URL
POSTGRES_TAG=15.6-alpine POSTGRES_TAG=15.6-alpine
OIDC_USER_GROUP="DKTK_CCP_$(capitalize_first_letter ${SITE_ID})"
OIDC_ADMIN_GROUP="DKTK_CCP_$(capitalize_first_letter ${SITE_ID})_Verwalter"
OIDC_PRIVATE_CLIENT_ID=${SITE_ID}-private
OIDC_PUBLIC_CLIENT_ID=${SITE_ID}-public
# Use "test-realm-01" for testing
OIDC_REALM="${OIDC_REALM:-master}"
OIDC_URL="https://login.verbis.dkfz.de"
OIDC_ISSUER_URL="${OIDC_URL}/realms/${OIDC_REALM}"
OIDC_GROUP_CLAIM="groups"
for module in $PROJECT/modules/*.sh for module in $PROJECT/modules/*.sh
do do
log DEBUG "sourcing $module" log DEBUG "sourcing $module"