From 7d263e089c1d7518d2b91ad96886f232ff28d994 Mon Sep 17 00:00:00 2001 From: Sebastian Harl Date: Tue, 17 Sep 2013 07:44:44 +0200 Subject: [PATCH] collectd.conf: Recursively include all '*.conf' files in collectd.conf.d/. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit … using the new 'Include' option's 'Filter' feature. Thanks to Laurent Bigonville for suggesting this change. Closes: #690668 --- debian/changelog | 4 ++++ debian/collectd.conf | 5 +++-- debian/collectd.install | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) 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 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" # -Include "/etc/collectd/filters.conf" -Include "/etc/collectd/thresholds.conf" + + Filter "*.conf" + 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/ -- 2.30.2