From 993feca80a5517bd84cd136af74972d3c9f09945 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= Date: Thu, 14 Feb 2019 12:08:08 +0100 Subject: [PATCH] - improve syslog-ng.d rules --- syslog-ng.conf | 2 +- syslog-ng.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/syslog-ng.conf b/syslog-ng.conf index 4333781..7b28eec 100644 --- a/syslog-ng.conf +++ b/syslog-ng.conf @@ -141,4 +141,4 @@ log { source(s_sys); destination(d_messages); flags(fallback); }; # put any customization files in this directory -@include "/etc/syslog-ng.d/" +@include "/etc/syslog-ng.d/*.conf" diff --git a/syslog-ng.spec b/syslog-ng.spec index 687f019..66e380d 100644 --- a/syslog-ng.spec +++ b/syslog-ng.spec @@ -515,7 +515,7 @@ rm -f %{_var}/lib/%{name}/syslog-ng.persist exit 0 %triggerun -- syslog-ng < 3.19.1 -grep -q '/etc/syslog-ng.d/' /etc/syslog-ng/syslog-ng.conf || echo '@include "/etc/syslog-ng.d/"' >> /etc/syslog-ng/syslog-ng.conf +grep -q '^@include "/etc/syslog-ng\.d/\*\.conf"' /etc/syslog-ng/syslog-ng.conf || echo '@include "/etc/syslog-ng.d/*.conf"' >> /etc/syslog-ng/syslog-ng.conf exit 0 %post libs -p /sbin/ldconfig -- 2.44.0