From dc8dc4b94b33c89535bb811abf2d9ba651cc8f75 Mon Sep 17 00:00:00 2001 From: Robert Butora <robert.butora@inaf.it> Date: Fri, 1 Nov 2024 10:36:34 +0100 Subject: [PATCH] docker: adds AuthDB support - makes params optional --- docker/start-soda.sh.soda | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/docker/start-soda.sh.soda b/docker/start-soda.sh.soda index b8f912f..b07d140 100755 --- a/docker/start-soda.sh.soda +++ b/docker/start-soda.sh.soda @@ -20,6 +20,11 @@ OIDC_GMS_URL=${OIDC_GMS_URL:-} OIDC_CLIENT=${OIDC_CLIENT:-} OIDC_SECRET=${OIDC_SECRET:-} +AUTHZ_DB_URL=${AUTHZ_DB_URL:-} +AUTHZ_DB_SCHEMA=${AUTHZ_DB_SCHEMA:-} +AUTHZ_DB_USERNAME=${AUTHZ_DB_USERNAME:-} +AUTHZ_DB_PASSWORD=${AUTHZ_DB_PASSWORD:-} + # configure CONTEXT_ROOT @@ -99,7 +104,7 @@ fi # VLKB authorization -if [ -z "$AUTHZ_DB_URL" ] || [ -z "$AUTHZ_DB_SCHEMA" ] || [ -z "$AUTHZ_DB_USER" ] || [ -z "$AUTHZ_DB_PASSWORD" ]; +if [ -z "$AUTHZ_DB_URL" ] || [ -z "$AUTHZ_DB_SCHEMA" ] || [ -z "$AUTHZ_DB_USERNAME" ] || [ -z "$AUTHZ_DB_PASSWORD" ]; then echo "Some of AUTHZ_DB_ is not set." else @@ -107,7 +112,7 @@ else { echo "db_uri=$AUTHZ_DB_URL" echo "db_schema=$AUTHZ_DB_SCHEMA" - echo "db_user_name=$AUTHZ_DB_USER" + echo "db_user_name=$AUTHZ_DB_USERNAME" echo "db_password=$AUTHZ_DB_PASSWORD" } > $WEBAPP_DIR/WEB-INF/classes/authpolicy.properties # cp $WEBAPP_DIR/WEB-INF/web-cutout-ia2token.xml $WEBAPP_DIR/WEB-INF/web.xml -- GitLab