GRP-2888: GROUPERUI_LOGOUT_REDIRECTTOURL is set in wrong place in

container workflow
docker · Jul 19, 2020 · 80d4441 · 80d4441
1 parent e0ed075
commit 80d4441
Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/container_files/usr-local-bin/libraryPrep.sh b/container_files/usr-local-bin/libraryPrep.sh
@@ -172,6 +172,7 @@ prep_finishEnd() {
     if [ -z "$GROUPER_MAX_MEMORY" ]; then export GROUPER_MAX_MEMORY=1500m; fi
     if [ -z "$GROUPER_CONTEXT_COOKIES" ]; then export GROUPER_CONTEXT_COOKIES=true; fi
     if [ -z "$GROUPER_TOMCAT_LOG_ACCESS" ]; then export GROUPER_TOMCAT_LOG_ACCESS=false; fi
+    if [ "$GROUPER_RUN_SHIB_SP" = "true" ] && [ -z "$GROUPERUI_LOGOUT_REDIRECTTOURL" ]; then export GROUPERUI_LOGOUT_REDIRECTTOURL=/Shibboleth.sso/Logout; fi
 
 }
 

diff --git a/container_files/usr-local-bin/librarySetupFiles.sh b/container_files/usr-local-bin/librarySetupFiles.sh
@@ -28,7 +28,7 @@ setupFiles_rsyncSlashRoot() {
 setupFiles_localLogging() {
     if [ "$GROUPER_LOG_TO_HOST" = "true" ]
       then
-        cp /opt/grouper/grouperWebapp/WEB-INF/classes/log4j.grouperContainerHost.properties /opt/grouper/grouperWebapp/WEB-INF/classes/log4j.properties
+        cp -v /opt/grouper/grouperWebapp/WEB-INF/classes/log4j.grouperContainerHost.properties /opt/grouper/grouperWebapp/WEB-INF/classes/log4j.properties
     fi
 
 }

diff --git a/container_files/usr-local-bin/librarySetupFilesApache.sh b/container_files/usr-local-bin/librarySetupFilesApache.sh
@@ -3,7 +3,7 @@
 setupFilesApache_selfSignedCert() {
     if [ "$GROUPER_RUN_APACHE" = "true" ] && [ "$GROUPER_SELF_SIGNED_CERT" = "true" ] && [ "$GROUPER_USE_SSL" = "true" ]
        then
-         cp /opt/tier-support/ssl-enabled.conf /etc/httpd/conf.d/
+         cp -v /opt/tier-support/ssl-enabled.conf /etc/httpd/conf.d/
     fi
 }
 
@@ -12,11 +12,11 @@ setupFilesApache_ssl() {
        then
        if [ -f /etc/httpd/conf.d/ssl.conf ]
          then
-           mv /etc/httpd/conf.d/ssl.conf /etc/httpd/conf.d/ssl.conf.dontuse
+           mv -v /etc/httpd/conf.d/ssl.conf /etc/httpd/conf.d/ssl.conf.dontuse
        fi
        if [ -f /etc/httpd/conf.d/ssl-enabled.conf ]
          then
-           mv /etc/httpd/conf.d/ssl-enabled.conf /etc/httpd/conf.d/ssl-enabled.conf.dontuse
+           mv -v /etc/httpd/conf.d/ssl-enabled.conf /etc/httpd/conf.d/ssl-enabled.conf.dontuse
        fi
     fi
 }

diff --git a/container_files/usr-local-bin/librarySetupFilesForProcess.sh b/container_files/usr-local-bin/librarySetupFilesForProcess.sh
@@ -56,17 +56,16 @@ setupFilesForProcess_shib() {
   if [ "$GROUPER_RUN_TOMCAT_NOT_SUPERVISOR" != "true" ]; then
     if [ -f /etc/httpd/conf.d/shib.conf ]
       then
-        mv /etc/httpd/conf.d/shib.conf /etc/httpd/conf.d/shib.conf.dontuse
+        mv -v /etc/httpd/conf.d/shib.conf /etc/httpd/conf.d/shib.conf.dontuse
     fi
 
     if [ "$GROUPER_RUN_SHIB_SP" = "true" ]
       then
         setupPipe_shibdLog
         export LD_LIBRARY_PATH=/opt/shibboleth/lib64:$LD_LIBRARY_PATH
         cat /opt/tier-support/supervisord-shibsp.conf >> /opt/tier-support/supervisord.conf
-        cp /opt/tier-support/httpd-shib.conf /etc/httpd/conf.d/
-        mv /etc/httpd/conf.d/shib.conf.dontuse /etc/httpd/conf.d/shib.conf
-        if [ -z "$GROUPERUI_LOGOUT_REDIRECTTOURL" ]; then export GROUPERUI_LOGOUT_REDIRECTTOURL=/Shibboleth.sso/Logout; fi
+        cp -v /opt/tier-support/httpd-shib.conf /etc/httpd/conf.d/
+        mv -v /etc/httpd/conf.d/shib.conf.dontuse /etc/httpd/conf.d/shib.conf
     fi
   fi