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 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