collectd.conf: Recursively include all '*.conf' files in collectd.conf.d/.

… using the new 'Include' option's 'Filter' feature.

Thanks to Laurent Bigonville for suggesting this change.
Closes: #690668

diff --git a/debian/changelog b/debian/changelog
index e9a0a5330b68d1e0defb7f6b58ee3c6643fafb2f..30d609c7b697e4f9c9143144713011df484a2bcd 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -52,6 +52,10 @@ collectd (5.4.0-1) UNRELEASED; urgency=low
       Torracca (Closes: #705869).
     - Updated Japanese debconf template translation; thanks to 'victory'
       (Closes: #715283).
+  * debian/collectd.conf:
+    - Recursively include all '*.conf' files in /etc/collectd/collectd.conf.d/
+      using the new 'Include' option's 'Filter' feature; thanks to Laurent
+      Bigonville for suggesting this change (Closes: #690668).
 
  -- Sebastian Harl <tokkee@debian.org>  Thu, 02 May 2013 21:22:46 +0200
 

diff --git a/debian/collectd.conf b/debian/collectd.conf
index 18925d0ab4a865db147b6943e078a05d6cd45c28..d86429be2bf4fc03cc061de95015725be0186c35 100644 (file)
--- a/debian/collectd.conf
+++ b/debian/collectd.conf
@@ -1103,6 +1103,7 @@ LoadPlugin users
 #      Tag "foobar"
 #</Plugin>
 
-Include "/etc/collectd/filters.conf"
-Include "/etc/collectd/thresholds.conf"
+<Include "/etc/collectd/collectd.conf.d">
+       Filter "*.conf"
+</Include>
 

diff --git a/debian/collectd.install b/debian/collectd.install
index 9ae1c89f5f7b763ec88ded7d6258be623cfb5da9..9947c7e328fcb93a83f729669a8af90d7383d987 100644 (file)
--- a/debian/collectd.install
+++ b/debian/collectd.install
@@ -1,2 +1,2 @@
 ../collectd.conf etc/collectd/
-../thresholds.conf ../filters.conf etc/collectd/
+../thresholds.conf ../filters.conf etc/collectd/collectd.conf.d/