From 4ae3d475d7a497dbf65df6306fb3ff3f94a6774b Mon Sep 17 00:00:00 2001 From: Sebastian Harl Date: Mon, 31 Mar 2008 12:16:03 +0200 Subject: [PATCH] Removed iptables from the package description and collectd.conf. Also /usr/share/doc/collectd/examples/iptables/ has been removed from the package. --- debian/README.Debian | 4 ---- debian/changelog | 6 ++++-- debian/collectd.conf | 5 ----- debian/collectd.overrides | 1 - debian/control | 1 - debian/rules | 2 +- 6 files changed, 5 insertions(+), 14 deletions(-) diff --git a/debian/README.Debian b/debian/README.Debian index 654b5aa..0c640a1 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -94,10 +94,6 @@ Examples: documentation for information about setup and configuration: perldoc Collectd.pm. -- iptables/: This directory contains a script which will setup iptables to do - global logging of all traffic going in and out of an interface. This - information can then be collected by collectd's iptables plugin. - - cussh.pl: "Collectd Unix Socket SHell" is a small, interactive front-end for the unixsock plugin. See the embedded POD documentation for details: perldoc cussh.pl. diff --git a/debian/changelog b/debian/changelog index 30ebbe4..78ff780 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,9 +12,11 @@ collectd (4.3.2-1) unstable; urgency=low - fr.po, thanks to Florent Usseil (Closes: #468813). - pt.po, thanks to Américo Monteiro (Closes: #469745, #472183). * collectd.init.d: Consider the DISABLE option only when starting collectd. - * Disabled iptables plugin - libiptc is no longer available on Debian. + * Disabled iptables plugin - libiptc is no longer available in Debian. + - Removed the plugin from collectd.conf. + - Removed /usr/share/doc/collectd/examples/iptables/. - -- Sebastian Harl Sat, 29 Mar 2008 13:38:22 +0100 + -- Sebastian Harl Mon, 31 Mar 2008 12:13:18 +0200 collectd (4.3.0-2) unstable; urgency=low diff --git a/debian/collectd.conf b/debian/collectd.conf index 086820c..3677425 100644 --- a/debian/collectd.conf +++ b/debian/collectd.conf @@ -42,7 +42,6 @@ LoadPlugin entropy #LoadPlugin exec #LoadPlugin hddtemp LoadPlugin interface -#LoadPlugin iptables #LoadPlugin ipvs LoadPlugin irq #LoadPlugin libvirt @@ -126,10 +125,6 @@ LoadPlugin users # IgnoreSelected false # -# -# Chain "table" "chain" -# - # # Irq 7 # Irq 8 diff --git a/debian/collectd.overrides b/debian/collectd.overrides index 5208c6a..9350ff0 100644 --- a/debian/collectd.overrides +++ b/debian/collectd.overrides @@ -1,5 +1,4 @@ collectd: shlib-with-non-pic-code usr/lib/collectd/nut.so -collectd: shlib-with-non-pic-code usr/lib/collectd/iptables.so collectd: shlib-with-non-pic-code usr/lib/collectd/netlink.so collectd: spelling-error-in-description mysql MySQL diff --git a/debian/control b/debian/control index e6f1ad4..a48bacb 100644 --- a/debian/control +++ b/debian/control @@ -47,7 +47,6 @@ Description: statistics collection and monitoring daemon * execution of external programs: exec * harddisk temperature: hddtemp * network traffic: interface - * iptables statistics: iptables * IPVS connection statistics: ipvs * IRQ counters: irq * CPU, dist, network statistics of guest systems: libvirt diff --git a/debian/rules b/debian/rules index 9953252..568c9a6 100755 --- a/debian/rules +++ b/debian/rules @@ -143,7 +143,7 @@ binary-arch: build install-arch dh_installexamples -a contrib/collectd2html.pl contrib/collection.cgi \ contrib/exec-munin.conf contrib/exec-munin.px contrib/exec-smartctl \ contrib/exec-nagios.conf contrib/exec-nagios.px \ - contrib/SpamAssassin/ contrib/iptables/ contrib/cussh.pl \ + contrib/SpamAssassin/ contrib/cussh.pl \ contrib/snmp-data.conf contrib/add_rra.sh contrib/network-proxy.py dh_installdebconf -a dh_installinit -a -- defaults 95 -- 2.30.2