From 7b0b67fb05010406ed9af0a8f13eb51f89d883e6 Mon Sep 17 00:00:00 2001 From: Chris Hyzer Date: Wed, 17 Nov 2021 09:38:58 -0500 Subject: [PATCH] GRP-3698: allow GrouperSystem password to be set by env var in container (not in quickstart mode) --- container_files/usr-local-bin/libraryPrep.sh | 4 ++-- .../usr-local-bin/librarySetupFilesForComponent.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/container_files/usr-local-bin/libraryPrep.sh b/container_files/usr-local-bin/libraryPrep.sh index 62fdf847..bfb227b1 100644 --- a/container_files/usr-local-bin/libraryPrep.sh +++ b/container_files/usr-local-bin/libraryPrep.sh @@ -44,8 +44,8 @@ prep_quickstart() { export GROUPER_RUN_SHIB_SP=false fi if [ -z "$GROUPER_AUTO_DDL_UPTOVERSION" ]; then - echo "grouperContainer; INFO: (libraryPrep.sh-prep_quickstart) export GROUPER_AUTO_DDL_UPTOVERSION='v2.5.*'" - export GROUPER_AUTO_DDL_UPTOVERSION='v2.5.*' + echo "grouperContainer; INFO: (libraryPrep.sh-prep_quickstart) export GROUPER_AUTO_DDL_UPTOVERSION='v2.6.*'" + export GROUPER_AUTO_DDL_UPTOVERSION='v2.6.*' fi if [ -z "$GROUPER_UI_CONFIGURATION_EDITOR_SOURCEIPADDRESSES" ]; then echo "grouperContainer; INFO: (libraryPrep.sh-prep_quickstart) export GROUPER_UI_CONFIGURATION_EDITOR_SOURCEIPADDRESSES='0.0.0.0/0'" diff --git a/container_files/usr-local-bin/librarySetupFilesForComponent.sh b/container_files/usr-local-bin/librarySetupFilesForComponent.sh index c508c247..63fb95db 100644 --- a/container_files/usr-local-bin/librarySetupFilesForComponent.sh +++ b/container_files/usr-local-bin/librarySetupFilesForComponent.sh @@ -39,7 +39,7 @@ setupFilesForComponent_ui() { setupFilesForComponent_quickstart() { - if [ ! -z "$GROUPERSYSTEM_QUICKSTART_PASS" ] && [ "$GROUPER_QUICKSTART" = 'true' ] + if [ ! -z "$GROUPERSYSTEM_QUICKSTART_PASS" ] then if [ "$GROUPER_UI_GROUPER_AUTH" = 'true' ] then