- improve syslog-ng.d rules

diff --git a/syslog-ng.conf b/syslog-ng.conf
index 433378198ea842b18008a70a512eb19262e4bf3b..7b28eec1402c4ef47d220437e81a87eea5ca74e4 100644 (file)
--- 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 687f019714a39698761ac248fa938aec3d75fb94..66e380d899c9d3cc8ef19aaaf3b6822f686e9628 100644 (file)
--- 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