GRP-2856: shibboleth logs external to container option

docker · Jul 19, 2020 · 3c4eff4 · 3c4eff4
1 parent 4fbfec9
commit 3c4eff4
Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/container_files/usr-local-bin/libraryPrep.sh b/container_files/usr-local-bin/libraryPrep.sh
@@ -163,6 +163,8 @@ prep_finishBegin() {
     if [ -z "$GROUPER_TOMCAT_AJP_PORT" ]; then export GROUPER_TOMCAT_AJP_PORT=8009; fi
     if [ -z "$GROUPER_TOMCAT_SHUTDOWN_PORT" ]; then export GROUPER_TOMCAT_SHUTDOWN_PORT=8005; fi
 
+    if [ -z "$GROUPER_SHIB_LOG_USE_PIPE" ]; then export GROUPER_SHIB_LOG_USE_PIPE=true; fi
+
 }
 
 prep_finishEnd() {

diff --git a/container_files/usr-local-bin/librarySetupFilesForProcess.sh b/container_files/usr-local-bin/librarySetupFilesForProcess.sh
@@ -61,7 +61,10 @@ setupFilesForProcess_shib() {
 
     if [ "$GROUPER_RUN_SHIB_SP" = "true" ]
       then
-        setupPipe_shibdLog
+        if [ "$GROUPER_SHIB_LOG_USE_PIPE" = "true" ]
+          then
+            setupPipe_shibdLog
+        fi
         export LD_LIBRARY_PATH=/opt/shibboleth/lib64:$LD_LIBRARY_PATH
         cat /opt/tier-support/supervisord-shibsp.conf >> /opt/tier-support/supervisord.conf
         cp -v /opt/tier-support/httpd-shib.conf /etc/httpd/conf.d/