From 4f3d4dbc853c324a4b8c4380992452fc3f49a5be Mon Sep 17 00:00:00 2001 From: TheSpad Date: Mon, 5 Feb 2024 13:53:00 +0000 Subject: [PATCH] Suppress symbol errors, auto-popular default conf version --- root/defaults/syslog-ng.conf | 2 +- root/etc/s6-overlay/s6-rc.d/init-syslog-ng-config/run | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/root/defaults/syslog-ng.conf b/root/defaults/syslog-ng.conf index 48d2f15..e341dab 100644 --- a/root/defaults/syslog-ng.conf +++ b/root/defaults/syslog-ng.conf @@ -2,7 +2,7 @@ # Default syslog-ng.conf file which collects all local logs into a # single file called /var/log/messages tailored to container usage. -@version: 4.1 +@version: |VERSION| @include "scl.conf" source s_local { diff --git a/root/etc/s6-overlay/s6-rc.d/init-syslog-ng-config/run b/root/etc/s6-overlay/s6-rc.d/init-syslog-ng-config/run index c215636..7d3b5df 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-syslog-ng-config/run +++ b/root/etc/s6-overlay/s6-rc.d/init-syslog-ng-config/run @@ -2,12 +2,14 @@ # shellcheck shell=bash #Copy defaults +SYSLOG_VERSION=$(syslog-ng --version 2>/dev/null | grep "Config version" | awk -F ':' '{print $2}' | tr -d '[:space:]') + if [[ ! -f "/config/syslog-ng.conf" ]]; then cp -a /defaults/syslog-ng.conf /config/syslog-ng.conf + sed -i "s/|VERSION|/${SYSLOG_VERSION}/" /config/syslog-ng.conf fi CONF_VERSION=$(grep -oP "@version: \K(\d+\.\d+)" "/config/syslog-ng.conf") -SYSLOG_VERSION=$(syslog-ng --version | grep "Config version" | awk -F ':' '{print $2}' | tr -d '[:space:]') if [[ -f "/config/syslog-ng.conf" ]] && (( $(bc -l <<< "${CONF_VERSION} < ${SYSLOG_VERSION}") )); then cat <<-EOF @@ -21,7 +23,7 @@ cat <<-EOF * To upgrade the configuration, please review any * * warnings about incompatible changes in the log. * * * -* Once completed change the @version header at the * +* Once completed change the @version header at the * * top of the configuration file to "${SYSLOG_VERSION}" * * * * *