From 7fa1eae30795a5da9cab16dff12cb8507dd640df Mon Sep 17 00:00:00 2001
From: Robert Butora <robert.butora@inaf.it>
Date: Sat, 1 Mar 2025 15:40:33 +0100
Subject: [PATCH] docker: renames SKAIAM_ -> OIDC_
---
docker/start-soda.sh | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/docker/start-soda.sh b/docker/start-soda.sh
index 4a16193..c05f019 100755
--- a/docker/start-soda.sh
+++ b/docker/start-soda.sh
@@ -8,12 +8,6 @@ env
# set optional
ACCESS_CONTEXT_ROOT=${ACCESS_CONTEXT_ROOT:-soda}
-SECURITY=${SECURITY:-}
-
-KEYSTORE_ALIAS=${KEYSTORE_ALIAS:-}
-SKAIAM_INTROSPECT=${SKAIAM_INTROSPECT:-}
-SKAIAM_CLIENT=${SKAIAM_CLIENT:-}
-SKAIAM_PASSWORD=${SKAIAM_PASSWORD:-}
OIDC_RAP_URL=${OIDC_RAP_URL:-}
OIDC_GMS_URL=${OIDC_GMS_URL:-}
@@ -25,6 +19,12 @@ AUTHZ_DB_SCHEMA=${AUTHZ_DB_SCHEMA:-}
AUTHZ_DB_USERNAME=${AUTHZ_DB_USERNAME:-}
AUTHZ_DB_PASSWORD=${AUTHZ_DB_PASSWORD:-}
+# deprecated
+OIDC_INTROSPECT=${OIDC_INTROSPECT:-}
+SECURITY=${SECURITY:-}
+KEYSTORE_ALIAS=${KEYSTORE_ALIAS:-}
+
+
# configure CONTEXT_ROOT
@@ -62,18 +62,18 @@ fi
# configure SKA IAM
-if [ -z "$SKAIAM_INTROSPECT" ] || [ -z "$SKAIAM_CLIENT" ] || [ -z "$SKAIAM_PASSWORD" ];
+if [ -z "$OIDC_INTROSPECT" ] || [ -z "$OIDC_CLIENT" ] || [ -z "$OIDC_PASSWORD" ];
then
- echo "Some of SKAIAM_ is not set."
- echo "url: "$SKAIAM_INTROSPECT
- echo "cli: "$SKAIAM_CLIENT
- echo "pwd: "$SKAIAM_PASSWORD
+ echo "Some of OIDC_ for SKA IAM is not set."
+ echo "url: "$OIDC_INTROSPECT
+ echo "cli: "$OIDC_CLIENT
+ echo "pwd: "$OIDC_PASSWORD
else
echo "Config SKA IAM ..."
{
- echo "introspect=$SKAIAM_INTROSPECT"
- echo "client_name=$SKAIAM_CLIENT"
- echo "client_password=$SKAIAM_PASSWORD"
+ echo "introspect=$OIDC_INTROSPECT"
+ echo "client_name=$OIDC_CLIENT"
+ echo "client_password=$OIDC_PASSWORD"
} > $WEBAPP_DIR/WEB-INF/classes/iamtoken.properties
cp $WEBAPP_DIR/WEB-INF/web-cutout-iamtoken.xml $WEBAPP_DIR/WEB-INF/web.xml
fi
@@ -82,7 +82,7 @@ fi
if [ -z "$OIDC_RAP_URL" ] || [ -z "$OIDC_GMS_URL" ] || [ -z "$OIDC_CLIENT" ] || [ -z "$OIDC_SECRET" ];
then
- echo "Some of OIDC_ is not set."
+ echo "Some of OIDC_ for IA2 is not set."
echo "rap: "$OIDC_RAP_URL
echo "gms: "$OIDC_GMS_URL
echo "cli: "$OIDC_CLIENT
--
GitLab