From 6656f1d6ebd54633fb7e50fdcc784342bafdba7a Mon Sep 17 00:00:00 2001 From: Sebastian Harl Date: Sat, 19 May 2007 21:12:50 +0200 Subject: [PATCH] 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/. --- debian/collection.conf | 3 +++ debian/patches/00list | 1 + debian/patches/collection_conf_path.dpatch | 19 +++++++++++++++++++ debian/rules | 2 ++ 4 files changed, 25 insertions(+) create mode 100644 debian/collection.conf create mode 100755 debian/patches/collection_conf_path.dpatch diff --git a/debian/collection.conf b/debian/collection.conf new file mode 100644 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 0d82f45..1ebda45 100644 --- 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 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 +## +## 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 7cf5eba..c14d076 100755 --- 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/; \ -- 2.30.2