GRP-3102: add verbose starting output to container

docker · Jan 28, 2021 · 9b56c85 · 9b56c85
1 parent 3ddf473
commit 9b56c85
Show file tree

Hide file tree

Showing 14 changed files with 472 additions and 136 deletions.
diff --git a/container_files/tier-support/test/grouperContainerUnitTestUiSubimageNonroot.sh b/container_files/tier-support/test/grouperContainerUnitTestUiSubimageNonroot.sh
@@ -54,7 +54,7 @@ testContainerUiSubimageNonroot() {
   assertEnvVar GROUPER_APACHE_AJP_TIMEOUT_SECONDS "3600"
   assertEnvVar GROUPER_APACHE_NONSSL_PORT "80"
   assertEnvVar GROUPER_APACHE_SSL_PORT "443"
-  assertEnvVar GROUPER_CHOWN_DIRS "true"
+  assertEnvVarNot GROUPER_CHOWN_DIRS "true"
   assertEnvVar GROUPER_CONTAINER_VERSION "$containerVersion"
   assertEnvVar GROUPER_DAEMON "false"
   assertEnvVar GROUPER_GSH_CHECK_USER "true"

diff --git a/container_files/tier-support/test/testContainer.Dockerfile b/container_files/tier-support/test/testContainer.Dockerfile
@@ -1,8 +1,8 @@
 # this matches the version you decided on from release notes
-ARG GROUPER_VERSION=2.5.XX
+ARG GROUPER_VERSION=2.5.40
 
 #  --build-arg GROUPER_VERSION=${VARIABLE_NAME} i2incommon/grouper:${GROUPER_VERSION}
-FROM __BASE_CONTAINER__
+FROM i2incommon/grouper:2.5.40
 
 # this will overlay all the files from /opt/grouperContainer/slashRoot on to /
 COPY slashRoot /

diff --git a/container_files/usr-local-bin/changeGid.sh b/container_files/usr-local-bin/changeGid.sh
@@ -13,6 +13,6 @@ newGid=$2
 getentOutput="$(getent group "$groupname")"
 oldGid="$( echo "$getentOutput" |cut -d\: -f3 )"
 groupmod -g "$newGid" "$groupname"
-echo "grouperContainer; INFO: (changeGid.sh) groupmod -g $newGid $groupname , result: $?"
+echo "grouperContainer; INFO: (changeGid.sh) groupmod -g \"$newGid\" \"$groupname\" , result: $?"
 find / -xdev -type d -group "$oldGid" -exec chgrp -h "$groupname" {} \;
-echo "grouperContainer; INFO: (changeGid.sh) find / -xdev -type d -group $oldGid -exec chgrp -h $groupname {} \; , result: $?"
+echo "grouperContainer; INFO: (changeGid.sh) find / -xdev -type d -group \"$oldGid\" -exec chgrp -h \"$groupname\" {} \; , result: $?"
diff --git a/container_files/usr-local-bin/changeUid.sh b/container_files/usr-local-bin/changeUid.sh
@@ -12,6 +12,6 @@ username=$1
 newUid=$2
 oldUid="$(id -u "$username")"
 usermod -u "$newUid" "$username"
-echo "grouperContainer; INFO: (changeUid.sh) usermod -u $newUid $username , result: $?"
+echo "grouperContainer; INFO: (changeUid.sh) usermod -u \"$newUid\" \"$username\" , result: $?"
 find / -xdev -type d -user "$oldUid" -exec chown -h "$username" {} \;
-echo "grouperContainer; INFO: (changeUid.sh) find / -xdev -type d -user $oldUid -exec chown -h $username {} \; , result: $?"
+echo "grouperContainer; INFO: (changeUid.sh) find / -xdev -type d -user \"$oldUid\" -exec chown -h \"$username\" {} \; , result: $?"
diff --git a/container_files/usr-local-bin/gsh b/container_files/usr-local-bin/gsh
@@ -10,9 +10,10 @@ export GSH_JVMARGS="$GSH_JVMARGS -DENV=$ENV -DUSERTOKEN=$USERTOKEN"
 # openshift cannot do whoami
 if [ "$GROUPER_GSH_CHECK_USER" = "true"  ] && [ "$GROUPER_GSH_USER" != "$(whoami)" ]
   then
+    echo "grouperContainer; INFO: (gsh file) sudo --preserve-env -u tomcat bin/gsh.sh \"$@\" | tee /tmp/loggrouper"
     sudo --preserve-env -u tomcat bin/gsh.sh "$@" | tee /tmp/loggrouper
   else 
+    echo "grouperContainer; INFO: (gsh file) bin/gsh.sh \"$@\" | tee /tmp/loggrouper"
     exec bin/gsh.sh "$@" | tee /tmp/loggrouper
-
 fi
 
diff --git a/container_files/usr-local-bin/library.sh b/container_files/usr-local-bin/library.sh
@@ -27,7 +27,9 @@ echo "grouperContainer; INFO: (library.sh) Start loading library.sh"
 # need this before the copy happens
 if [ -f /opt/grouper/slashRoot/usr/local/bin/grouperScriptHooks.sh ] ; then
   cp /opt/grouper/slashRoot/usr/local/bin/grouperScriptHooks.sh /usr/local/bin/grouperScriptHooks.sh
-  echo "grouperContainer; INFO: (library.sh) cp /opt/grouper/slashRoot/usr/local/bin/grouperScriptHooks.sh /usr/local/bin/grouperScriptHooks.sh, result=$?"
+  returnCode=$?
+  echo "grouperContainer; INFO: (library.sh) cp /opt/grouper/slashRoot/usr/local/bin/grouperScriptHooks.sh /usr/local/bin/grouperScriptHooks.sh, result=$returnCode"
+  if [ $returnCode != 0 ]; then exit $returnCode; fi
 fi
 # implementations of custom hooks
 . /usr/local/bin/grouperScriptHooks.sh

diff --git a/container_files/usr-local-bin/libraryPrep.sh b/container_files/usr-local-bin/libraryPrep.sh
diff --git a/container_files/usr-local-bin/libraryPrepOnly.sh b/container_files/usr-local-bin/libraryPrepOnly.sh
@@ -3,56 +3,92 @@
 prepOnly_component() {
     if [ "$GROUPER_WS" = "true" ] && [ "$GROUPER_UI" != "true" ] && [ "$GROUPER_SCIM" != "true" ] && [ "$GROUPER_DAEMON" != "true" ]
        then
-         if [ -z "$GROUPER_WS_ONLY" ] ; then export GROUPER_WS_ONLY=true; fi
+         if [ -z "$GROUPER_WS_ONLY" ] ; then 
+           echo "grouperContainer; INFO: (libraryPrep.sh-prepOnly_component) export GROUPER_WS_ONLY=true"
+           export GROUPER_WS_ONLY=true
+         fi
     fi
 
     if [ "$GROUPER_WS" != "true" ] && [ "$GROUPER_UI" != "true" ] && [ "$GROUPER_SCIM" = "true" ] && [ "$GROUPER_DAEMON" != "true" ]
        then
-         if [ -z "$GROUPER_SCIM_ONLY" ] ; then export GROUPER_SCIM_ONLY=true; fi
+         if [ -z "$GROUPER_SCIM_ONLY" ] ; then 
+           echo "grouperContainer; INFO: (libraryPrep.sh-prepOnly_component) export GROUPER_SCIM_ONLY=true"
+           export GROUPER_SCIM_ONLY=true
+         fi
     fi
 
     if [ "$GROUPER_WS" != "true" ] && [ "$GROUPER_UI" = "true" ] && [ "$GROUPER_SCIM" != "true" ] && [ "$GROUPER_DAEMON" != "true" ]
        then
-         if [ -z "$GROUPER_UI_ONLY" ] ; then export GROUPER_UI_ONLY=true; fi
+         if [ -z "$GROUPER_UI_ONLY" ] ; then 
+           echo "grouperContainer; INFO: (libraryPrep.sh-prepOnly_component) export GROUPER_UI_ONLY=true"
+           export GROUPER_UI_ONLY=true
+         fi
     fi
 
     if [ "$GROUPER_WS" != "true" ] && [ "$GROUPER_UI" != "true" ] && [ "$GROUPER_SCIM" != "true" ] && [ "$GROUPER_DAEMON" = "true" ]
       then
-         if [ -z "$GROUPER_DAEMON_ONLY" ] ; then export GROUPER_DAEMON_ONLY=true; fi
+         if [ -z "$GROUPER_DAEMON_ONLY" ] ; then 
+           echo "grouperContainer; INFO: (libraryPrep.sh-prepOnly_component) export GROUPER_DAEMON_ONLY=true"
+           export GROUPER_DAEMON_ONLY=true
+         fi
     fi 
 }
 
 prepOnly_ui() {
     if [ "$GROUPER_UI_ONLY" = "true" ]
        then
-         if [ -z "$GROUPER_LOG_PREFIX" ]; then export GROUPER_LOG_PREFIX=grouper-ui; fi
+         if [ -z "$GROUPER_LOG_PREFIX" ]; then 
+           echo "grouperContainer; INFO: (libraryPrep.sh-prepOnly_ui) export GROUPER_LOG_PREFIX=grouper-ui"
+           export GROUPER_LOG_PREFIX=grouper-ui
+         fi
     fi
 }
 
 prepOnly_ws() {
     if [ "$GROUPER_WS_ONLY" = "true" ]
        then
-         if [ -z "$GROUPER_LOG_PREFIX" ]; then export GROUPER_LOG_PREFIX=grouper-ws; fi
-         if [ -z "$GROUPER_CONTEXT_COOKIES" ]; then export GROUPER_CONTEXT_COOKIES=false; fi
+         if [ -z "$GROUPER_LOG_PREFIX" ]; then export 
+           echo "grouperContainer; INFO: (libraryPrep.sh-prepOnly_ui) export GROUPER_LOG_PREFIX=grouper-ws"
+           GROUPER_LOG_PREFIX=grouper-ws
+         fi
+         if [ -z "$GROUPER_CONTEXT_COOKIES" ]; then 
+           echo "grouperContainer; INFO: (libraryPrep.sh-prepOnly_ui) export GROUPER_CONTEXT_COOKIES=false"
+           export GROUPER_CONTEXT_COOKIES=false
+         fi
          # default to whatever ws context is
-         if [ -z "$GROUPER_TOMCAT_CONTEXT" ] ; then export GROUPER_TOMCAT_CONTEXT="$GROUPERWS_URL_CONTEXT"; fi
+         if [ -z "$GROUPER_TOMCAT_CONTEXT" ] ; then 
+           echo "grouperContainer; INFO: (libraryPrep.sh-prepOnly_ui) GROUPER_TOMCAT_CONTEXT=$GROUPERWS_URL_CONTEXT"
+           export GROUPER_TOMCAT_CONTEXT="$GROUPERWS_URL_CONTEXT"
+         fi
     fi
 }
 
 prepOnly_scim() {
    if [ "$GROUPER_SCIM_ONLY" = "true" ]
        then
-         if [ -z "$GROUPER_LOG_PREFIX" ]; then export GROUPER_LOG_PREFIX=grouper-scim; fi
-         if [ -z "$GROUPER_CONTEXT_COOKIES" ]; then export GROUPER_CONTEXT_COOKIES=false; fi
+         if [ -z "$GROUPER_LOG_PREFIX" ]; then 
+           echo "grouperContainer; INFO: (libraryPrep.sh-prepOnly_scim) GROUPER_LOG_PREFIX=grouper-scim"
+           export GROUPER_LOG_PREFIX=grouper-scim
+         fi
+         if [ -z "$GROUPER_CONTEXT_COOKIES" ]; then 
+           echo "grouperContainer; INFO: (libraryPrep.sh-prepOnly_scim) GROUPER_CONTEXT_COOKIES=false"
+           export GROUPER_CONTEXT_COOKIES=false
+         fi
          # default to whatever scim context is
-         if [ -z "$GROUPER_TOMCAT_CONTEXT" ] ; then export GROUPER_TOMCAT_CONTEXT="$GROUPERSCIM_URL_CONTEXT"; fi
+         if [ -z "$GROUPER_TOMCAT_CONTEXT" ] ; then 
+           echo "grouperContainer; INFO: (libraryPrep.sh-prepOnly_scim) GROUPER_TOMCAT_CONTEXT=$GROUPERSCIM_URL_CONTEXT"
+           export GROUPER_TOMCAT_CONTEXT="$GROUPERSCIM_URL_CONTEXT"
+         fi
     fi
 }
 
 prepOnly_daemon() {
     if [ "$GROUPER_DAEMON_ONLY" = "true" ]
       then
-       if [ -z "$GROUPER_LOG_PREFIX" ]; then export GROUPER_LOG_PREFIX=grouper-daemon; fi
+       if [ -z "$GROUPER_LOG_PREFIX" ]; then
+         echo "grouperContainer; INFO: (libraryPrep.sh-prepOnly_daemon) GROUPER_LOG_PREFIX=grouper-daemon"
+         export GROUPER_LOG_PREFIX=grouper-daemon
+       fi
     fi 
 }
 

diff --git a/container_files/usr-local-bin/librarySetupFiles.sh b/container_files/usr-local-bin/librarySetupFiles.sh
@@ -7,12 +7,24 @@ setupFiles_linkGrouperSecrets() {
 
         if [[ $label_file == grouper_* ]]; then
             ln -sf /run/secrets/$label_file /opt/grouper/grouperWebapp/WEB-INF/classes/$file
+            returnCode=$?
+            echo "grouperContainer; INFO: (librarySetupFiles.sh-setupFiles_linkGrouperSecrets) ln -sf /run/secrets/$label_file /opt/grouper/grouperWebapp/WEB-INF/classes/$file, result: $returnCode"
+            if [ $returnCode != 0 ]; then exit $returnCode; fi
         elif [[ $label_file == shib_* ]]; then
             ln -sf /run/secrets/$label_file /etc/shibboleth/$file
+            returnCode=$?
+            echo "grouperContainer; INFO: (librarySetupFiles.sh-setupFiles_linkGrouperSecrets) ln -sf /run/secrets/$label_file /etc/shibboleth/$file, result: $returnCode"
+            if [ $returnCode != 0 ]; then exit $returnCode; fi
         elif [[ $label_file == httpd_* ]]; then
             ln -sf /run/secrets/$label_file /etc/httpd/conf.d/$file
+            returnCode=$?
+            echo "grouperContainer; INFO: (librarySetupFiles.sh-setupFiles_linkGrouperSecrets) ln -sf /run/secrets/$label_file /etc/httpd/conf.d/$file, result: $returnCode"
+            if [ $returnCode != 0 ]; then exit $returnCode; fi
         elif [ "$label_file" == "host-key.pem" ]; then
             ln -sf /run/secrets/host-key.pem /etc/pki/tls/private/host-key.pem
+            returnCode=$?
+            echo "grouperContainer; INFO: (librarySetupFiles.sh-setupFiles_linkGrouperSecrets) ln -sf /run/secrets/host-key.pem /etc/pki/tls/private/host-key.pem, result: $returnCode"
+            if [ $returnCode != 0 ]; then exit $returnCode; fi
         fi
     done
 }
@@ -21,8 +33,10 @@ setupFiles_rsyncSlashRoot() {
     if [ -d "/opt/grouper/slashRoot" ]; then
         # Copy any files into the root filesystem
         rsync -l -r -v /opt/grouper/slashRoot/ /
+        returnCode=$?
+        echo "grouperContainer; INFO: (librarySetupFiles.sh-setupFiles_rsyncSlashRoot) rsync -l -r -v /opt/grouper/slashRoot/ /, result: $returnCode"
+        if [ $returnCode != 0 ]; then exit $returnCode; fi
     fi
-
 }
 
 setupFiles_localLogging() {
@@ -47,10 +61,10 @@ setupFiles_chownDirs() {
     # do this last
     if [ "$GROUPER_CHOWN_DIRS" = "true" ]
       then
-        chown -R tomcat:tomcat /opt/grouper/grouperWebapp
-        echo "grouperContainer; INFO: (librarySetupFiles.sh-setupFiles_chownDirs) chown -R tomcat:tomcat /opt/grouper/grouperWebapp, result: $?"
-        chown -R tomcat:tomcat /opt/tomee
-        echo "grouperContainer; INFO: (librarySetupFiles.sh-setupFiles_chownDirs) chown -R tomcat:tomcat /opt/tomee, result: $?"
+        chown -R tomcat:tomcat /opt/grouper/grouperWebapp /opt/tomee
+        returnCode=$?
+        echo "grouperContainer; INFO: (librarySetupFiles.sh-setupFiles_chownDirs) chown -R tomcat:tomcat /opt/grouper/grouperWebapp /opt/tomee, result: $returnCode"
+        if [ $returnCode != 0 ]; then exit $returnCode; fi
     fi
 }
 
@@ -64,18 +78,25 @@ setupFiles_storeEnvVars() {
   # go through env vars, should start with GROUPER and have an equals sign in there
   env | grep "^GROUPER" | grep "=" | sort >> /opt/grouper/grouperEnv.sh
 
+  returnCode=$?
+  echo "grouperContainer; INFO: (librarySetupFiles.sh-setupFiles_storeEnvVars) env | grep \"^GROUPER\" | grep \"=\" | sort >> /opt/grouper/grouperEnv.sh, result: $returnCode"
+  if [ $returnCode != 0 ]; then exit $returnCode; fi
+
   sed -i "s|^GROUPER|export GROUPER|g" /opt/grouper/grouperEnv.sh
 
   if [ ! -f /home/tomcat/.bashrc ]
     then
       echo "grouperContainer; ERROR: (librarySetupFiles.sh-setupFiles_storeEnvVars) Why doesnt /home/tomcat/.bashrc exist????"
       exit 1
-  fi  
+  fi
   if ! grep -q grouperEnv /home/tomcat/.bashrc
     then
-      echo "" >> /home/tomcat/.bashrc  
+      echo "" >> /home/tomcat/.bashrc
       echo ". /opt/grouper/grouperEnv.sh" >> /home/tomcat/.bashrc
-      echo "" >> /home/tomcat/.bashrc  
+      echo "" >> /home/tomcat/.bashrc
+      returnCode=$?
+      echo "grouperContainer; INFO: (librarySetupFiles.sh-setupFiles_storeEnvVars) echo \". /opt/grouper/grouperEnv.sh\" >> /home/tomcat/.bashrc , result: $returnCode"
+      if [ $returnCode != 0 ]; then exit $returnCode; fi
   fi
 
   # if we own this file (i.e. running as root)  
@@ -94,6 +115,9 @@ setupFiles_storeEnvVars() {
         echo "export JAVA_HOME=$JAVA_HOME" >> /etc/bashrc  
         echo "export PATH=$JAVA_HOME/bin:\$PATH" >> /etc/bashrc  
         echo "" >> /etc/bashrc  
+        returnCode=$?
+        echo "grouperContainer; INFO: (librarySetupFiles.sh-setupFiles_storeEnvVars)  echo env var script to /etc/bashrc, result: $returnCode"
+        if [ $returnCode != 0 ]; then exit $returnCode; fi
     fi    
   fi 
   echo "grouperContainer; INFO: (librarySetupFiles.sh-setupFiles_storeEnvVars) End store env vars in /opt/grouper/grouperEnv.sh"
@@ -128,56 +152,110 @@ setupFiles_analyzeOriginalFiles() {
     setupFiles_originalFile /opt/tomee/conf/Catalina/localhost/grouper.xml
     original_file=$?
     if [ -z "$GROUPER_ORIGFILE_GROUPER_XML" ] && [[ $original_file -eq 0 ]]
-      then export GROUPER_ORIGFILE_GROUPER_XML=true; fi
-    if [ -z "$GROUPER_ORIGFILE_GROUPER_XML" ] ; then export GROUPER_ORIGFILE_GROUPER_XML=false; fi
+      then
+        echo "grouperContainer; INFO: (librarySetupFiles.sh-setupFiles_analyzeOriginalFiles) export GROUPER_ORIGFILE_GROUPER_XML=true"
+        export GROUPER_ORIGFILE_GROUPER_XML=true
+    fi
+    if [ -z "$GROUPER_ORIGFILE_GROUPER_XML" ] ; then 
+      echo "grouperContainer; INFO: (librarySetupFiles.sh-setupFiles_analyzeOriginalFiles) export GROUPER_ORIGFILE_GROUPER_XML=false"
+      export GROUPER_ORIGFILE_GROUPER_XML=false
+    fi
 
     setupFiles_originalFile /opt/tomee/conf/server.xml
     original_file=$?
     if [ -z "$GROUPER_ORIGFILE_SERVER_XML" ] && [[ $original_file -eq 0 ]]
-      then export GROUPER_ORIGFILE_SERVER_XML=true; fi
-    if [ -z "$GROUPER_ORIGFILE_SERVER_XML" ] ; then export GROUPER_ORIGFILE_SERVER_XML=false; fi
+      then 
+        echo "grouperContainer; INFO: (librarySetupFiles.sh-setupFiles_analyzeOriginalFiles) export GROUPER_ORIGFILE_SERVER_XML=true"
+        export GROUPER_ORIGFILE_SERVER_XML=true
+    fi
+    if [ -z "$GROUPER_ORIGFILE_SERVER_XML" ] ; then 
+      echo "grouperContainer; INFO: (librarySetupFiles.sh-setupFiles_analyzeOriginalFiles) export GROUPER_ORIGFILE_SERVER_XML=false"
+      export GROUPER_ORIGFILE_SERVER_XML=false
+    fi
 
     setupFiles_originalFile /opt/grouper/grouperWebapp/WEB-INF/classes/log4j.properties
     original_file=$?
     if [ -z "$GROUPER_ORIGFILE_LOG4J_PROPERTIES" ] && [[ $original_file -eq 0 ]]
-      then export GROUPER_ORIGFILE_LOG4J_PROPERTIES=true; fi
-    if [ -z "$GROUPER_ORIGFILE_LOG4J_PROPERTIES" ] ; then export GROUPER_ORIGFILE_LOG4J_PROPERTIES=false; fi
+      then 
+        echo "grouperContainer; INFO: (librarySetupFiles.sh-setupFiles_analyzeOriginalFiles) export GROUPER_ORIGFILE_LOG4J_PROPERTIES=true"
+        export GROUPER_ORIGFILE_LOG4J_PROPERTIES=true
+    fi
+    if [ -z "$GROUPER_ORIGFILE_LOG4J_PROPERTIES" ] ; then
+      echo "grouperContainer; INFO: (librarySetupFiles.sh-setupFiles_analyzeOriginalFiles) export GROUPER_ORIGFILE_LOG4J_PROPERTIES=false"
+      export GROUPER_ORIGFILE_LOG4J_PROPERTIES=false
+    fi
 
     setupFiles_originalFile /etc/httpd/conf/httpd.conf
     original_file=$?
     if [ -z "$GROUPER_ORIGFILE_HTTPD_CONF" ] && [[ $original_file -eq 0 ]]
-      then export GROUPER_ORIGFILE_HTTPD_CONF=true; fi
-    if [ -z "$GROUPER_ORIGFILE_HTTPD_CONF" ] ; then export GROUPER_ORIGFILE_HTTPD_CONF=false; fi
+      then 
+        echo "grouperContainer; INFO: (librarySetupFiles.sh-setupFiles_analyzeOriginalFiles) export GROUPER_ORIGFILE_HTTPD_CONF=true"
+        export GROUPER_ORIGFILE_HTTPD_CONF=true
+    fi
+    if [ -z "$GROUPER_ORIGFILE_HTTPD_CONF" ] ; then 
+      echo "grouperContainer; INFO: (librarySetupFiles.sh-setupFiles_analyzeOriginalFiles) export GROUPER_ORIGFILE_HTTPD_CONF=false"
+      export GROUPER_ORIGFILE_HTTPD_CONF=false
+    fi
 
     setupFiles_originalFile /etc/httpd/conf.d/ssl-enabled.conf
     original_file=$?
     if [ -z "$GROUPER_ORIGFILE_SSL_ENABLED_CONF" ] && [[ $original_file -eq 0 ]]
-      then export GROUPER_ORIGFILE_SSL_ENABLED_CONF=true; fi
-    if [ -z "$GROUPER_ORIGFILE_SSL_ENABLED_CONF" ] ; then export GROUPER_ORIGFILE_SSL_ENABLED_CONF=false; fi
+      then 
+        echo "grouperContainer; INFO: (librarySetupFiles.sh-setupFiles_analyzeOriginalFiles) export GROUPER_ORIGFILE_SSL_ENABLED_CONF=true"
+        export GROUPER_ORIGFILE_SSL_ENABLED_CONF=true
+    fi
+    if [ -z "$GROUPER_ORIGFILE_SSL_ENABLED_CONF" ] ; then 
+      echo "grouperContainer; INFO: (librarySetupFiles.sh-setupFiles_analyzeOriginalFiles) export GROUPER_ORIGFILE_SSL_ENABLED_CONF=false"
+      export GROUPER_ORIGFILE_SSL_ENABLED_CONF=false
+    fi
 
     setupFiles_originalFile /etc/httpd/conf.d/httpd-shib.conf
     original_file=$?
     if [ -z "$GROUPER_ORIGFILE_HTTPD_SHIB_CONF" ] && [[ $original_file -eq 0 ]]
-      then export GROUPER_ORIGFILE_HTTPD_SHIB_CONF=true; fi
-    if [ -z "$GROUPER_ORIGFILE_HTTPD_SHIB_CONF" ] ; then export GROUPER_ORIGFILE_HTTPD_SHIB_CONF=false; fi
+      then 
+        echo "grouperContainer; INFO: (librarySetupFiles.sh-setupFiles_analyzeOriginalFiles) export GROUPER_ORIGFILE_HTTPD_SHIB_CONF=true"
+        export GROUPER_ORIGFILE_HTTPD_SHIB_CONF=true
+    fi
+    if [ -z "$GROUPER_ORIGFILE_HTTPD_SHIB_CONF" ] ; then 
+      echo "grouperContainer; INFO: (librarySetupFiles.sh-setupFiles_analyzeOriginalFiles) export GROUPER_ORIGFILE_HTTPD_SHIB_CONF=false"
+      export GROUPER_ORIGFILE_HTTPD_SHIB_CONF=false
+    fi
 
     setupFiles_originalFile /etc/httpd/conf.d/shib.conf
     original_file=$?
     if [ -z "$GROUPER_ORIGFILE_SHIB_CONF" ] && [[ $original_file -eq 0 ]]
-      then export GROUPER_ORIGFILE_SHIB_CONF=true; fi
-    if [ -z "$GROUPER_ORIGFILE_SHIB_CONF" ] ; then export GROUPER_ORIGFILE_SHIB_CONF=false; fi
+      then 
+        echo "grouperContainer; INFO: (librarySetupFiles.sh-setupFiles_analyzeOriginalFiles) export GROUPER_ORIGFILE_SHIB_CONF=true"
+        export GROUPER_ORIGFILE_SHIB_CONF=true
+    fi
+    if [ -z "$GROUPER_ORIGFILE_SHIB_CONF" ] ; then 
+      echo "grouperContainer; INFO: (librarySetupFiles.sh-setupFiles_analyzeOriginalFiles) export GROUPER_ORIGFILE_SHIB_CONF=false"
+      export GROUPER_ORIGFILE_SHIB_CONF=false
+    fi
 
     setupFiles_originalFile /opt/tomee/conf/Catalina/localhost/grouper.xml
     original_file=$?
     if [ -z "$GROUPER_ORIGFILE_GROUPER_XML" ] && [[ $original_file -eq 0 ]]
-      then export GROUPER_ORIGFILE_GROUPER_XML=true; fi
-    if [ -z "$GROUPER_ORIGFILE_GROUPER_XML" ] ; then export GROUPER_ORIGFILE_GROUPER_XML=false; fi
+      then 
+        echo "grouperContainer; INFO: (librarySetupFiles.sh-setupFiles_analyzeOriginalFiles) export GROUPER_ORIGFILE_GROUPER_XML=true"
+        export GROUPER_ORIGFILE_GROUPER_XML=true
+    fi
+    if [ -z "$GROUPER_ORIGFILE_GROUPER_XML" ] ; then 
+      echo "grouperContainer; INFO: (librarySetupFiles.sh-setupFiles_analyzeOriginalFiles) export GROUPER_ORIGFILE_GROUPER_XML=false"
+      export GROUPER_ORIGFILE_GROUPER_XML=false
+    fi
 
     setupFiles_originalFile /opt/grouper/grouperWebapp/WEB-INF/web.xml
     original_file=$?
     if [ -z "$GROUPER_ORIGFILE_WEBAPP_WEB_XML" ] && [[ $original_file -eq 0 ]]
-      then export GROUPER_ORIGFILE_WEBAPP_WEB_XML=true; fi
-    if [ -z "$GROUPER_ORIGFILE_WEBAPP_WEB_XML" ] ; then export GROUPER_ORIGFILE_WEBAPP_WEB_XML=false; fi
+      then 
+        echo "grouperContainer; INFO: (librarySetupFiles.sh-setupFiles_analyzeOriginalFiles) export GROUPER_ORIGFILE_WEBAPP_WEB_XML=true"
+        export GROUPER_ORIGFILE_WEBAPP_WEB_XML=true
+    fi
+    if [ -z "$GROUPER_ORIGFILE_WEBAPP_WEB_XML" ] ; then 
+      echo "grouperContainer; INFO: (librarySetupFiles.sh-setupFiles_analyzeOriginalFiles) export GROUPER_ORIGFILE_WEBAPP_WEB_XML=false"
+      export GROUPER_ORIGFILE_WEBAPP_WEB_XML=false
+    fi
 
 }