Added collection.conf and collection_conf_path.dpatch.

collection_conf_path.dpatch sets the path to collection.conf in collection.cgi
from /etc/ to /etc/collectd/.

diff --git a/debian/collection.conf b/debian/collection.conf
new file mode 100644 (file)
index 0000000..958c7a6
--- /dev/null
+++ b/debian/collection.conf
@@ -0,0 +1,3 @@
+datadir: "/var/lib/collectd/rrd/"
+libdir: "/usr/lib/collectd/"
+

diff --git a/debian/patches/00list b/debian/patches/00list
index 0d82f454ca53ae8b2afde42d2484362da2de43eb..1ebda453056455e92958f720ec4181369e4cfcb9 100644 (file)
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,2 +1,3 @@
 extractDS_path.dpatch
+collection_conf_path.dpatch
 

diff --git a/debian/patches/collection_conf_path.dpatch b/debian/patches/collection_conf_path.dpatch
new file mode 100755 (executable)
index 0000000..c4f5b9b
--- /dev/null
+++ b/debian/patches/collection_conf_path.dpatch
@@ -0,0 +1,19 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+## extractDS_path.dpatch by Sebastian Harl <sh@tokkee.org>
+##
+## DP: Set the path of collection.conf to /etc/collectd/.
+
+@DPATCH@
+
+diff a/contrib/collection.cgi b/contrib/collection.cgi
+--- a/contrib/collection.cgi
++++ b/contrib/collection.cgi
+@@ -11,7 +11,7 @@ use URI::Escape ('uri_escape');
+ use RRDs ();
+ use Data::Dumper ();
+ 
+-our $Config = "/etc/collection.conf";
++our $Config = "/etc/collectd/collection.conf";
+ our @DataDirs = ();
+ our $LibDir;
+

diff --git a/debian/rules b/debian/rules
index 7cf5ebafdedb90e9dba8f9117a76e3084c3af03e..c14d07634a0c1ac9bdd463fec1170b7c06cb2547 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -80,6 +80,8 @@ install-arch: build
        rm -f debian/collectd/etc/collectd.conf
        install -D -m 0644 debian/collectd.conf \
                debian/collectd/etc/collectd/collectd.conf
+       install -m 0644 debian/collection.conf \
+               debian/collectd/etc/collectd/collection.conf
        
        for PLUGIN in apache dns mysql perl ping sensors; do \
                plugin_dir=debian/collectd-$$PLUGIN/usr/lib/collectd/; \