From: Sebastian Harl <sh@tokkee.org>
Date: Tue, 17 Sep 2013 05:44:44 +0000 (+0200)
Subject: collectd.conf: Recursively include all '*.conf' files in collectd.conf.d/.
X-Git-Tag: collectd-5.4.0-1~6
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=7d263e089c1d7518d2b91ad96886f232ff28d994;p=pkg-collectd.git

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 e9a0a53..30d609c 100644
--- 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 18925d0..d86429b 100644
--- 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 9ae1c89..9947c7e 100644
--- 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/