cubixle/packages
1
0
Fork 0
mirror of https://github.com/novatiq/packages.git synced 2026-04-30 07:28:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12038 from pprindeville/syslog-ng-includes-user-settings-last

Browse Source 
syslog-ng: including user settings after system settings
This commit is contained in:
Philip Prindeville
2020-05-06 16:20:54 -06:00
committed by GitHub
parent 1376a5fe66 f8443ae829
commit b9c6cb6f0f
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/syslog-ng/Makefile
+1 -1
View File
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=syslog-ng PKG_NAME:=syslog-ng
PKG_VERSION:=3.26.1 PKG_VERSION:=3.26.1
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_MAINTAINER:=Josef Schlehofer <josef.schlehofer@nic.cz> PKG_MAINTAINER:=Josef Schlehofer <josef.schlehofer@nic.cz>
PKG_LICENSE:=LGPL-2.1-or-later GPL-2.0-or-later PKG_LICENSE:=LGPL-2.1-or-later GPL-2.0-or-later
admin/syslog-ng/files/syslog-ng.conf
+6 -1
View File
@@ -6,7 +6,6 @@
@version: 3.26 @version: 3.26
@include "scl.conf" @include "scl.conf"
@include "/etc/syslog-ng.d/" # Put any customization files in this directory
options { options {
chain_hostnames(no); # Enable or disable the chained hostname format. 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 # uncomment this line to open port 514 to receive messages
#source(s_network); #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