Merge branch 'master' into TLS-Support-Tomcat

Modular Scripts/Tomcat/configure-tomcat.sh

@@ -606,6 +606,7 @@ if \$programname == 'tomcat-access' then ~
   fi
 
 	imfileStrNonTls=$commonContent"
+
 #parameterized token here.......
 #Add a tag for tomcat events
 \$template LogglyFormatTomcat,\"<%pri%>%protocol-version% %timestamp:::date-rfc3339% %HOSTNAME% %app-name% %procid% %msgid% [$LOGGLY_AUTH_TOKEN@41058 $TAG] %msg%\n\"
@@ -687,13 +688,13 @@ if \$programname == 'tomcat-access' then ~
 "
   fi
 
-    if [ $TLS_SENDING == "false" ];
+  if [ $TLS_SENDING == "false" ];
 	then
 		imfileStr=$imfileStrNonTls
 	fi
 
-	#change the tomcat-21 file to variable from above and also take the directory of the tomcat log file.
-sudo cat << EOIPFW >> $TOMCAT_SYSLOG_CONFFILE
+  #change the tomcat-21 file to variable from above and also take the directory of the tomcat log file.
+  sudo cat <<EOIPFW >>$TOMCAT_SYSLOG_CONFFILE
 $imfileStr
 EOIPFW
 
@@ -888,4 +889,4 @@ else
   usage
 fi
 
-##########  Get Inputs from User - End  ##########
+##########  Get Inputs from User - End  ##########