summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 4e3a0d5)
raw | patch | inline | side by side (parent: 4e3a0d5)
author | Marc Fournier <marc.fournier@camptocamp.com> | |
Fri, 16 Nov 2012 11:12:19 +0000 (12:12 +0100) | ||
committer | Florian Forster <octo@collectd.org> | |
Sat, 17 Nov 2012 09:37:17 +0000 (10:37 +0100) |
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>
#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>
src/collectd.conf.in | patch | blob | history |
diff --git a/src/collectd.conf.in b/src/collectd.conf.in
index 9f5dedcdf0ad64d38566212bb53fdb4f48f03fea..87af1c96c390b53ba79a51356c14f46678ece771 100644 (file)
--- a/src/collectd.conf.in
+++ b/src/collectd.conf.in
#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
#</Plugin>
#<Plugin csv>
-# DataDir "@prefix@/var/lib/@PACKAGE_NAME@/csv"
+# DataDir "@localstatedir@/lib/@PACKAGE_NAME@/csv"
# StoreRates false
#</Plugin>
#</Plugin>
#<Plugin email>
-# SocketFile "@prefix@/var/run/@PACKAGE_NAME@-email"
+# SocketFile "@localstatedir@/run/@PACKAGE_NAME@-email"
# SocketGroup "collectd"
# SocketPerms "0770"
# MaxConns 5
#<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>