From 7fe44778b12f9c62e5d157003cec0c4d152577d0 Mon Sep 17 00:00:00 2001 From: ondrejrozsypal Date: Mon, 4 May 2020 12:49:54 +0200 Subject: [PATCH 1/2] update script version --- Modular Scripts/Apache2/configure-apache.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modular Scripts/Apache2/configure-apache.sh b/Modular Scripts/Apache2/configure-apache.sh index 0c0c35f..bfaa9fc 100644 --- a/Modular Scripts/Apache2/configure-apache.sh +++ b/Modular Scripts/Apache2/configure-apache.sh @@ -9,7 +9,7 @@ source configure-linux.sh "being-invoked" #name of the current script SCRIPT_NAME=configure-apache.sh #version of the current script -SCRIPT_VERSION=1.6 +SCRIPT_VERSION=1.7 #we have not found the apache version yet at this point in the script APP_TAG="\"apache-version\":\"\"" From b2ea8f20c3653d90826e4695cc5d083b69b47658 Mon Sep 17 00:00:00 2001 From: ondrejrozsypal Date: Tue, 5 May 2020 08:58:24 +0200 Subject: [PATCH 2/2] use CA_FILE_PATH var defined in configure-linux.sh --- Modular Scripts/Apache2/configure-apache.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modular Scripts/Apache2/configure-apache.sh b/Modular Scripts/Apache2/configure-apache.sh index bfaa9fc..72a2978 100644 --- a/Modular Scripts/Apache2/configure-apache.sh +++ b/Modular Scripts/Apache2/configure-apache.sh @@ -267,7 +267,7 @@ write21ApacheFileContents() { \$ActionSendStreamDriverPermittedPeer *.loggly.com #RsyslogGnuTLS - \$DefaultNetstreamDriverCAFile /etc/rsyslog.d/keys/ca.d/logs-01.loggly.com_sha12.crt + \$DefaultNetstreamDriverCAFile $CA_FILE_PATH # Apache access file: \$InputFileName $LOGGLY_APACHE_LOG_HOME/$APACHE_ACCESS_LOG_FILE