From 07a6e8bc7338c4f359a3f9e93b1eea3439d6a4dd Mon Sep 17 00:00:00 2001 From: Philip Prindeville Date: Tue, 25 Jul 2017 14:10:15 -0600 Subject: [PATCH] syslog-ng: add customization directory Signed-off-by: Philip Prindeville --- admin/syslog-ng/Makefile | 7 ++++--- admin/syslog-ng/files/custom-logs.conf | 2 -- admin/syslog-ng/files/syslog-ng.conf | 3 ++- 3 files changed, 6 insertions(+), 6 deletions(-) delete mode 100644 admin/syslog-ng/files/custom-logs.conf diff --git a/admin/syslog-ng/Makefile b/admin/syslog-ng/Makefile index 47e5cce0f..e294ff577 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.9.1 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_MAINTAINER:=W. Michael Petullo @@ -30,7 +30,8 @@ define Package/syslog-ng/description endef define Package/syslog-ng/conffiles - /etc/syslog-ng.conf +/etc/syslog-ng.conf +/etc/syslog-ng.d/ endef define Build/Configure @@ -68,8 +69,8 @@ define Package/syslog-ng/install install-moduleLTLIBRARIES DESTDIR="$(1)" $(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_BIN) ./files/syslog-ng.init $(1)/etc/init.d/syslog-ng - $(INSTALL_DIR) $(1)/etc $(INSTALL_DATA) ./files/syslog-ng.conf $(1)/etc + $(INSTALL_DIR) $(1)/etc/syslog-ng.d/ $(call libtool_remove_files,$(1)) endef diff --git a/admin/syslog-ng/files/custom-logs.conf b/admin/syslog-ng/files/custom-logs.conf deleted file mode 100644 index 9c8f4413b..000000000 --- a/admin/syslog-ng/files/custom-logs.conf +++ /dev/null @@ -1,2 +0,0 @@ -# place to put customization of logging - diff --git a/admin/syslog-ng/files/syslog-ng.conf b/admin/syslog-ng/files/syslog-ng.conf index 9e09a79e2..cae24a848 100644 --- a/admin/syslog-ng/files/syslog-ng.conf +++ b/admin/syslog-ng/files/syslog-ng.conf @@ -36,5 +36,6 @@ log { destination(messages); }; -@include "/etc/custom-logs.conf" +# put any customization files in this directory +@include "/etc/syslog-ng.d/"