From: Philip Prindeville <redacted>
Date: Fri, 1 May 2020 17:15:57 +0000 (-0600)
Subject: syslog-ng: including user settings after system settings
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=f8443ae8295fd391f4927e4bb921b5fe9154d224;p=openwrt-packages.git

syslog-ng: including user settings after system settings

Initially we included user-specific settings last, so that they
could turn off or replace system settings... otherwise we only get
to change what's NOT explicitly set by the system.  This is overly
constraining.

Restore the original functionality of allowing the user to
override settings defined by the distribution's configuration.

Signed-off-by: Philip Prindeville <redacted>
---

diff --git a/admin/syslog-ng/Makefile b/admin/syslog-ng/Makefile
index b47151e46..50540d54e 100644
--- a/admin/syslog-ng/Makefile
+++ b/admin/syslog-ng/Makefile
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=syslog-ng
 PKG_VERSION:=3.26.1
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_MAINTAINER:=Josef Schlehofer <josef.schlehofer@nic.cz>
 PKG_LICENSE:=LGPL-2.1-or-later GPL-2.0-or-later
diff --git a/admin/syslog-ng/files/syslog-ng.conf b/admin/syslog-ng/files/syslog-ng.conf
index 01538f9c9..2181464b4 100644
--- a/admin/syslog-ng/files/syslog-ng.conf
+++ b/admin/syslog-ng/files/syslog-ng.conf
@@ -6,7 +6,6 @@
 
 @version: 3.26
 @include "scl.conf"
-@include "/etc/syslog-ng.d/" # Put any customization files in this directory
 
 options {
 	chain_hostnames(no); # Enable or disable the chained hostname format.
@@ -60,3 +59,9 @@ log {
 	# uncomment this line to open port 514 to receive messages
 	#source(s_network);
 };
+
+#
+# Finally, include any user settings last so that s/he can override or
+# supplement all "canned" settings inherited from the distribution.
+#
+@include "/etc/syslog-ng.d/" # Put any customization files in this directory