From 7bb10e54ef6ec66aa306d96e85bb0c4e1375c8ac Mon Sep 17 00:00:00 2001
From: Ubuntu <ubuntu@ip-172-31-8-19.us-west-2.compute.internal>
Date: Mon, 29 May 2017 07:38:36 +0000
Subject: [PATCH 1/2] Add Line breaks to Nginx script

---
 Modular Scripts/Nginx/configure-nginx.sh | 61 +++++++++++++++++++++---
 1 file changed, 55 insertions(+), 6 deletions(-)

diff --git a/Modular Scripts/Nginx/configure-nginx.sh b/Modular Scripts/Nginx/configure-nginx.sh
index 7ed1589..60dc88e 100644
--- a/Modular Scripts/Nginx/configure-nginx.sh	
+++ b/Modular Scripts/Nginx/configure-nginx.sh	
@@ -9,7 +9,7 @@ source configure-linux.sh "being-invoked"
 #name of the current script
 SCRIPT_NAME=configure-nginx.sh
 #version of the current script
-SCRIPT_VERSION=1.3
+SCRIPT_VERSION=1.4
 
 #we have not found the nginx version yet at this point in the script
 APP_TAG="\"nginx-version\":\"\""
@@ -43,6 +43,8 @@ LOGGLY_FILE_TAG="nginx"
 #add tags to the logs
 TAG=
 
+TLS_SENDING="true"
+
 ##########  Variable Declarations - End  ##########
 
 #check if nginx environment is compatible for Loggly
@@ -216,16 +218,52 @@ write21NginxFileContents()
 	sudo touch $NGINX_SYSLOG_CONFFILE
 	sudo chmod o+w $NGINX_SYSLOG_CONFFILE
 
-	imfileStr="\$ModLoad imfile
+	commonContent="
+	\$ModLoad imfile
 	\$InputFilePollInterval 10 
 	\$WorkDirectory $RSYSLOG_DIR
 	"
 	if [[ "$LINUX_DIST" == *"Ubuntu"* ]]; then
-		imfileStr+="\$PrivDropToGroup adm
+		commonContent+="\$PrivDropToGroup adm		
 		"
 	fi
 
-	imfileStr+="
+	imfileStr+=$commonContent"
+	
+	\$ActionSendStreamDriver gtls
+	\$ActionSendStreamDriverMode 1
+	\$ActionSendStreamDriverAuthMode x509/name
+	\$ActionSendStreamDriverPermittedPeer *.loggly.com
+	
+	#RsyslogGnuTLS
+	\$DefaultNetstreamDriverCAFile /etc/rsyslog.d/keys/ca.d/logs-01.loggly.com_sha12.crt
+	
+	# nginx access file:
+	\$InputFileName $LOGGLY_NGINX_LOG_HOME/$NGINX_ACCESS_LOG_FILE
+	\$InputFileTag nginx-access:
+	\$InputFileStateFile stat-nginx-access
+	\$InputFileSeverity info
+	\$InputFilePersistStateInterval 20000
+	\$InputRunFileMonitor
+
+	#nginx Error file: 
+	\$InputFileName $LOGGLY_NGINX_LOG_HOME/$NGINX_ERROR_LOG_FILE
+	\$InputFileTag nginx-error:
+	\$InputFileStateFile stat-nginx-error
+	\$InputFileSeverity error
+	\$InputFilePersistStateInterval 20000
+	\$InputRunFileMonitor
+
+	#Add a tag for nginx events
+	\$template LogglyFormatNginx,\"<%pri%>%protocol-version% %timestamp:::date-rfc3339% %HOSTNAME% %app-name% %procid% %msgid% [$LOGGLY_AUTH_TOKEN@41058 $TAG] %msg%\n\"
+
+	if \$programname == 'nginx-access' then @@logs-01.loggly.com:6514;LogglyFormatNginx
+	if \$programname == 'nginx-access' then ~
+	if \$programname == 'nginx-error' then @@logs-01.loggly.com:6514;LogglyFormatNginx
+	if \$programname == 'nginx-error' then ~
+	"
+
+	imfileStrNonTls=$commonContent"
 	# nginx access file:
 	\$InputFileName $LOGGLY_NGINX_LOG_HOME/$NGINX_ACCESS_LOG_FILE
 	\$InputFileTag nginx-access:
@@ -250,7 +288,12 @@ write21NginxFileContents()
 	if \$programname == 'nginx-error' then @@logs-01.loggly.com:514;LogglyFormatNginx
 	if \$programname == 'nginx-error' then ~
 	"
-
+	
+	if [ $TLS_SENDING == "false" ]; 
+	then
+		imfileStr=$imfileStrNonTls
+	fi
+	
 	#change the nginx-21 file to variable from above and also take the directory of the nginx log file.
 sudo cat << EOIPFW >> $NGINX_SYSLOG_CONFFILE
 $imfileStr
@@ -348,7 +391,7 @@ remove21NginxConfFile()
 usage()
 {
 cat << EOF
-usage: configure-nginx [-a loggly auth account or subdomain] [-t loggly token (optional)] [-u username] [-p password (optional)] [-tag filetag1,filetag2 (optional)] [-s suppress prompts {optional)]
+usage: configure-nginx [-a loggly auth account or subdomain] [-t loggly token (optional)] [-u username] [-p password (optional)] [-tag filetag1,filetag2 (optional)] [-s suppress prompts {optional)] [--insecure {to send logs without TLS} (optional)]
 usage: configure-nginx [-a loggly auth account or subdomain] [-r to rollback]
 usage: configure-nginx [-h for help]
 EOF
@@ -387,6 +430,11 @@ while [ "$1" != "" ]; do
 	  -s | --suppress )
 		  SUPPRESS_PROMPT="true"
 		  ;;
+		  --insecure )
+		LOGGLY_TLS_SENDING="false"
+		TLS_SENDING="false"
+		LOGGLY_SYSLOG_PORT=514
+		;;
       -h | --help)
           usage
           exit
@@ -408,3 +456,4 @@ else
 fi
 
 ##########  Get Inputs from User - End  ##########
+

From adbdaab6bc075065b1b8def3a0703e9579a92822 Mon Sep 17 00:00:00 2001
From: Cloud User <ec2-user@ip-172-31-6-224.us-west-2.compute.internal>
Date: Mon, 14 Aug 2017 13:02:13 +0000
Subject: [PATCH 2/2] Add systemd path to check for nginx service

---
 Modular Scripts/Nginx/configure-nginx.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Modular Scripts/Nginx/configure-nginx.sh b/Modular Scripts/Nginx/configure-nginx.sh
index 60dc88e..221c3e2 100644
--- a/Modular Scripts/Nginx/configure-nginx.sh	
+++ b/Modular Scripts/Nginx/configure-nginx.sh	
@@ -115,7 +115,11 @@ removeLogglyConfForNginx()
 checkNginxDetails()
 {	
 	#verify if nginx is installed as service
-	if [ ! -f /etc/init.d/$SERVICE ]; then
+	if [ -f /etc/init.d/$SERVICE ]; then
+	        logMsgToConfigSysLog "INFO" "INFO: Nginx is present as a service."
+	elif [ -f /usr/lib/systemd/system/$SERVICE.service ]; then
+		logMsgToConfigSysLog "INFO" "INFO: Nginx is present as a service."
+	else
 		logMsgToConfigSysLog "ERROR" "ERROR: Nginx is not configured as a service"
 		exit 1
 	fi