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 <philipp@redfish-solutions.com>

diff --git a/admin/syslog-ng/Makefile b/admin/syslog-ng/Makefile
index b47151e4679ece9713d68fad7d4992b227ecc13a..50540d54e7820d6390472dca6e02f40c73e221c2 100644 (file)
--- 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 01538f9c9a487d344b602034d50466d52b181849..2181464b495337e21b86256d350f7e4caa37f755 100644 (file)
--- 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