From 8ff6950960d2a98770d62a4beb3afdb2e06121db Mon Sep 17 00:00:00 2001 From: Starbeamrainbowlabs Date: Sun, 19 Jun 2022 18:04:01 +0100 Subject: [PATCH] logging: refine rsyslog-client --- src/steps-config/100-logging.sh | 1 - src/steps-postinstall/100-logging.sh | 5 ++++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/steps-config/100-logging.sh b/src/steps-config/100-logging.sh index 51e9bf0..82bf072 100755 --- a/src/steps-config/100-logging.sh +++ b/src/steps-config/100-logging.sh @@ -16,7 +16,6 @@ rm -rf /var/log/* case "${logging_mode}" in rsyslog-client ) queue_apt_install "rsyslog" "rsyslog-gnutls"; - do_ramlog ;; diff --git a/src/steps-postinstall/100-logging.sh b/src/steps-postinstall/100-logging.sh index 8265a27..2218366 100755 --- a/src/steps-postinstall/100-logging.sh +++ b/src/steps-postinstall/100-logging.sh @@ -3,10 +3,13 @@ #shellcheck disable=2154 case "${logging_mode}" in rsyslog-client ) + curl -sSL https://letsencrypt.org/certs/isrg-root-x1-cross-signed.pem -o /etc/ssl/isrg-root-x1-cross-signed.pem; + if [[ -r "/etc/rsyslog.conf" ]]; then mv /etc/rsyslog.conf /etc/rsyslog.conf.dpkg-dist; fi - cp configs/rsyslog-client.conf /etc/rsyslog.conf + + cp configs/rsyslog-client.conf /etc/rsyslog.conf; ;; esac