From 22681b294de344b24d88cca45869d0910ac4d75e Mon Sep 17 00:00:00 2001
From: TheSpad <git@spad.co.uk>
Date: Wed, 14 Jun 2023 16:24:18 +0100
Subject: [PATCH 1/2] Update default conf and improve conf version check

---
 Dockerfile                                            | 1 +
 Dockerfile.aarch64                                    | 1 +
 root/defaults/syslog-ng.conf                          | 4 ++--
 root/etc/s6-overlay/s6-rc.d/init-syslog-ng-config/run | 7 +++++--
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 083837b..63dbdf7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,6 +15,7 @@ RUN \
     && awk '/^P:syslog-ng$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \
   fi && \
   apk add -U --upgrade --no-cache \
+    grep \
     libdbi-drivers \
     paho-mqtt-c \
     py3-syslog-ng \
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 2c59020..3d9dd9d 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -15,6 +15,7 @@ RUN \
     && awk '/^P:syslog-ng$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \
   fi && \
   apk add -U --upgrade --no-cache \
+    grep \
     libdbi-drivers \
     paho-mqtt-c \
     py3-syslog-ng \
diff --git a/root/defaults/syslog-ng.conf b/root/defaults/syslog-ng.conf
index 2a37b6d..48d2f15 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: 3.35
+@version: 4.1
 @include "scl.conf"
 
 source s_local {
@@ -27,4 +27,4 @@ log {
   source(s_network_tcp);
   source(s_network_udp);
   destination(d_local);
-};
\ No newline at end of file
+};
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 0148d1b..6813ddb 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
@@ -6,8 +6,11 @@ if [[ ! -f "/config/syslog-ng.conf" ]]; then
     cp -a /defaults/syslog-ng.conf /config/syslog-ng.conf
 fi
 
-if [[ -f "/config/syslog-ng.conf" ]] && [[ $(grep "@version: 3.29" "/config/syslog-ng.conf") ]]; then
-    SYSLOG_VERSION=$(syslog-ng --version | grep "Config version" | awk -F ':' '{print $2}' | tr -d '[:space:]')
+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
 ********************************************************
 ********************************************************

From 7b264a641279050dcbe6d4079f952f6156883662 Mon Sep 17 00:00:00 2001
From: TheSpad <git@spad.co.uk>
Date: Wed, 14 Jun 2023 16:24:57 +0100
Subject: [PATCH 2/2] Remove empty line

---
 root/etc/s6-overlay/s6-rc.d/init-syslog-ng-config/run | 1 -
 1 file changed, 1 deletion(-)

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 6813ddb..c215636 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
@@ -10,7 +10,6 @@ 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
 ********************************************************
 ********************************************************