Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[LOG-8159] Use CA file with public root certificates #132

Merged
merged 13 commits into from Apr 27, 2020

add method for setting path to ca bundle

  • Loading branch information
ondrejrozsypal committed Apr 20, 2020
commit 7f41ed53d601bfe659377cc502f53554dee36e15
@@ -503,9 +503,22 @@ checkAuthTokenAndWriteContents() {
fi
}

setPathToCABundle () {
case "$LINUX_DIST_IN_LOWER_CASE" in
*"debian"* | *"ubuntu"*)
CA_PATH="/etc/ssl/certs/ca-certificates.crt"
This conversation was marked as resolved by ondrejrozsypal

This comment has been minimized.

@Ljancek

Ljancek Apr 22, 2020
Contributor

Suggested change
CA_PATH="/etc/ssl/certs/ca-certificates.crt"
CA_FILE_PATH="/etc/ssl/certs/ca-certificates.crt"
;;
*"red"* | *"centos"* | *"amazon"*)
CA_PATH="/etc/ssl/certs/ca-bundle.crt"
This conversation was marked as resolved by ondrejrozsypal

This comment has been minimized.

@Ljancek

Ljancek Apr 22, 2020
Contributor

Suggested change
CA_PATH="/etc/ssl/certs/ca-bundle.crt"
CA_FILE_PATH="/etc/ssl/certs/ca-bundle.crt"
;;
*)
logMsgToConfigSysLog "WARN" "WARN: The linux distribution '$LINUX_DIST' has not been previously tested with Loggly. Verify path to CA bundle of your linux distribution in '$RSYSLOG_ETCDIR_CONF' -> '\$DefaultNetstreamDriverCAFile' and restart rsyslog service or re-run script with '--inssecure' attribute. Default path to CA bundle is '$CA_PATH'."
This conversation was marked as resolved by ondrejrozsypal

This comment has been minimized.

@Ljancek

Ljancek Apr 22, 2020
Contributor

Suggested change
logMsgToConfigSysLog "WARN" "WARN: The linux distribution '$LINUX_DIST' has not been previously tested with Loggly. Verify path to CA bundle of your linux distribution in '$RSYSLOG_ETCDIR_CONF' -> '\$DefaultNetstreamDriverCAFile' and restart rsyslog service or re-run script with '--inssecure' attribute. Default path to CA bundle is '$CA_PATH'."
logMsgToConfigSysLog "WARN" "WARN: The linux distribution '$LINUX_DIST' has not been previously tested with Loggly. Verify path to CA bundle of your linux distribution in '$RSYSLOG_ETCDIR_CONF' -> '\$DefaultNetstreamDriverCAFile' and restart rsyslog service or re-run script with '--inssecure' attribute. Default path to CA bundle is '$CA_FILE_PATH'."
;;
esac
}

confString() {
setPathToCABundle
RSYSLOG_VERSION_TMP=$(echo $RSYSLOG_VERSION | cut -d "." -f1)
inputStr_TLS_RSYS_7="
# -------------------------------------------------------
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.