Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x into seventeen-geoip

[ipfire-2.x.git] / config / rootfiles / common / collectd

diff --git a/config/rootfiles/common/collectd b/config/rootfiles/common/collectd
index 0fe7afc037263aa84335e841a6bb83045c3f7c22..2b9fa285c78b318d07441d2750ea2b1869edc122 100644 (file)
--- a/config/rootfiles/common/collectd
+++ b/config/rootfiles/common/collectd
@@ -1,7 +1,10 @@
 etc/collectd.conf
+etc/collectd.custom
+etc/collectd.precache
 etc/collectd.thermal
+etc/rc.d/init.d/collectd
 etc/rc.d/rc0.d/K50collectd
-etc/rc.d/rc3.d/S21collectd
+etc/rc.d/rc3.d/S29collectd
 etc/rc.d/rc6.d/K50collectd
 #usr/bin/collectd-nagios
 #usr/etc/collectd.conf
@@ -39,6 +42,9 @@ usr/lib/collectd/cpufreq.so
 #usr/lib/collectd/curl.a
 #usr/lib/collectd/curl.la
 usr/lib/collectd/curl.so
+#usr/lib/collectd/curl_xml.a
+#usr/lib/collectd/curl_xml.la
+usr/lib/collectd/curl_xml.so
 #usr/lib/collectd/df.a
 #usr/lib/collectd/df.la
 usr/lib/collectd/df.so
@@ -135,6 +141,9 @@ usr/lib/collectd/protocols.so
 #usr/lib/collectd/python.a
 #usr/lib/collectd/python.la
 usr/lib/collectd/python.so
+#usr/lib/collectd/rrdcached.a
+#usr/lib/collectd/rrdcached.la
+usr/lib/collectd/rrdcached.so
 #usr/lib/collectd/rrdtool.a
 #usr/lib/collectd/rrdtool.la
 usr/lib/collectd/rrdtool.so
@@ -203,14 +212,14 @@ usr/lib/collectd/write_http.so
 usr/lib/libcollectdclient.so
 usr/lib/libcollectdclient.so.0
 usr/lib/libcollectdclient.so.0.0.0
-#usr/lib/perl5/site_perl/5.8.8/Collectd
-#usr/lib/perl5/site_perl/5.8.8/Collectd.pm
-#usr/lib/perl5/site_perl/5.8.8/Collectd/Plugins
-#usr/lib/perl5/site_perl/5.8.8/Collectd/Plugins/Monitorus.pm
-#usr/lib/perl5/site_perl/5.8.8/Collectd/Plugins/OpenVZ.pm
-#usr/lib/perl5/site_perl/5.8.8/Collectd/Unixsock.pm
-#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Collectd
-#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Collectd/.packlist
+#usr/lib/perl5/site_perl/5.12.3/Collectd
+#usr/lib/perl5/site_perl/5.12.3/Collectd.pm
+#usr/lib/perl5/site_perl/5.12.3/Collectd/Plugins
+#usr/lib/perl5/site_perl/5.12.3/Collectd/Plugins/Monitorus.pm
+#usr/lib/perl5/site_perl/5.12.3/Collectd/Plugins/OpenVZ.pm
+#usr/lib/perl5/site_perl/5.12.3/Collectd/Unixsock.pm
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Collectd
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Collectd/.packlist
 #usr/lib/pkgconfig/libcollectdclient.pc
 usr/sbin/collectd
 usr/sbin/collectdmon
@@ -231,4 +240,3 @@ usr/share/collectd/types.db
 #usr/share/man/man5/collectd.conf.5
 #usr/share/man/man5/types.db.5
 #var/lib/collectd
-etc/rc.d/init.d/collectd