From 0d3396674f26a05c76136bcdc8e78e35947d1905 Mon Sep 17 00:00:00 2001 From: ondrejrozsypal Date: Fri, 15 May 2020 07:21:28 +0200 Subject: [PATCH 1/2] update script version --- Modular Scripts/Nginx/configure-nginx.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modular Scripts/Nginx/configure-nginx.sh b/Modular Scripts/Nginx/configure-nginx.sh index a9f6e3c..a498299 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.4 +SCRIPT_VERSION=1.5 #we have not found the nginx version yet at this point in the script APP_TAG="\"nginx-version\":\"\"" From c4714e2b3ef6e184af9e30e28d2c1f12fce90605 Mon Sep 17 00:00:00 2001 From: ondrejrozsypal Date: Fri, 15 May 2020 07:22:37 +0200 Subject: [PATCH 2/2] update $DefaultNetstreamDriverCAFile path to truststore - based on linux distribution --- Modular Scripts/Nginx/configure-nginx.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modular Scripts/Nginx/configure-nginx.sh b/Modular Scripts/Nginx/configure-nginx.sh index a498299..662a71a 100644 --- a/Modular Scripts/Nginx/configure-nginx.sh +++ b/Modular Scripts/Nginx/configure-nginx.sh @@ -229,7 +229,7 @@ write21NginxFileContents() { \$ActionSendStreamDriverPermittedPeer *.loggly.com #RsyslogGnuTLS - \$DefaultNetstreamDriverCAFile /etc/rsyslog.d/keys/ca.d/logs-01.loggly.com_sha12.crt + \$DefaultNetstreamDriverCAFile $CA_FILE_PATH # nginx access file: \$InputFileName $LOGGLY_NGINX_LOG_HOME/$NGINX_ACCESS_LOG_FILE