From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Fri, 16 Nov 2012 11:12:19 +0000 (+0100)
Subject: fixed paths in example configuration file
X-Git-Tag: collectd-5.2.0~9
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;ds=sidebyside;h=25fa4ad93203289ec8d78e8d4b687acc3c05004a;p=collectd.git

fixed paths in example configuration file

These paths previously got expanded to:
  #BaseDir "/usr/var/lib/collectd"
instead of:
  #BaseDir "/var/lib/collectd"

And on systems which put libs in /usr/lib64:
  #PluginDir   "/usr/lib/collectd"
instead of:
  #PluginDir   "/usr/lib64/collectd"

Signed-off-by: Florian Forster <octo@collectd.org>
---

diff --git a/src/collectd.conf.in b/src/collectd.conf.in
index 9f5dedcd..87af1c96 100644
--- a/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@ -12,9 +12,9 @@
 
 #Hostname    "localhost"
 #FQDNLookup   true
-#BaseDir     "@prefix@/var/lib/@PACKAGE_NAME@"
-#PIDFile     "@prefix@/var/run/@PACKAGE_NAME@.pid"
-#PluginDir   "@prefix@/lib/@PACKAGE_NAME@"
+#BaseDir     "@localstatedir@/lib/@PACKAGE_NAME@"
+#PIDFile     "@localstatedir@/run/@PACKAGE_NAME@.pid"
+#PluginDir   "@libdir@/@PACKAGE_NAME@"
 #TypesDB     "@prefix@/share/@PACKAGE_NAME@/types.db"
 #Interval     10
 #Timeout      2
@@ -238,7 +238,7 @@
 #</Plugin>
 
 #<Plugin csv>
-#	DataDir "@prefix@/var/lib/@PACKAGE_NAME@/csv"
+#	DataDir "@localstatedir@/lib/@PACKAGE_NAME@/csv"
 #	StoreRates false
 #</Plugin>
 
@@ -351,7 +351,7 @@
 #</Plugin>
 
 #<Plugin email>
-#	SocketFile "@prefix@/var/run/@PACKAGE_NAME@-email"
+#	SocketFile "@localstatedir@/run/@PACKAGE_NAME@-email"
 #	SocketGroup "collectd"
 #	SocketPerms "0770"
 #	MaxConns 5
@@ -828,13 +828,13 @@
 
 #<Plugin rrdcached>
 #	DaemonAddress "unix:/tmp/rrdcached.sock"
-#	DataDir "@prefix@/var/lib/@PACKAGE_NAME@/rrd"
+#	DataDir "@localstatedir@/lib/@PACKAGE_NAME@/rrd"
 #	CreateFiles true
 #	CollectStatistics true
 #</Plugin>
 
 #<Plugin rrdtool>
-#	DataDir "@prefix@/var/lib/@PACKAGE_NAME@/rrd"
+#	DataDir "@localstatedir@/lib/@PACKAGE_NAME@/rrd"
 #	CacheTimeout 120
 #	CacheFlush   900
 #</Plugin>