Merge pull request #12038 from pprindeville/syslog-ng-includes-user-settings-last
syslog-ng: including user settings after system settings
This commit is contained in:
commit
b9c6cb6f0f
2 changed files with 7 additions and 2 deletions
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue