$NetBSD: patch-src_collectd.conf.in,v 1.2 2015/06/10 20:05:26 fhajny Exp $ Fix default dirs. --- src/collectd.conf.in.orig 2015-05-20 12:05:42.672060002 +0000 +++ src/collectd.conf.in @@ -12,7 +12,7 @@ #Hostname "localhost" #FQDNLookup true -#BaseDir "@localstatedir@/lib/@PACKAGE_NAME@" +#BaseDir "@localstatedir@/db/@PACKAGE_NAME@" #PIDFile "@localstatedir@/run/@PACKAGE_NAME@.pid" #PluginDir "@libdir@/@PACKAGE_NAME@" #TypesDB "@prefix@/share/@PACKAGE_NAME@/types.db" @@ -315,16 +315,16 @@ # LongRunAvgLatency false # ConvertSpecialMetricTypes true # -# SocketPath "/var/run/ceph/ceph-osd.0.asok" +# SocketPath "@localstatedir@/run/ceph/ceph-osd.0.asok" # # -# SocketPath "/var/run/ceph/ceph-osd.1.asok" +# SocketPath "@localstatedir@/run/ceph/ceph-osd.1.asok" # # -# SocketPath "/var/run/ceph/ceph-mon.ceph1.asok" +# SocketPath "@localstatedir@/run/ceph/ceph-mon.ceph1.asok" # # -# SocketPath "/var/run/ceph/ceph-mds.ceph1.asok" +# SocketPath "@localstatedir@/run/ceph/ceph-mds.ceph1.asok" # # @@ -340,7 +340,7 @@ # # # -# DataDir "@localstatedir@/lib/@PACKAGE_NAME@/csv" +# DataDir "@localstatedir@/db/@PACKAGE_NAME@/csv" # StoreRates false # @@ -683,7 +683,7 @@ # # Alias "squeeze" # Host "localhost" -# Socket "/var/run/mysql/mysqld.sock" +# Socket "@localstatedir@/run/mysql/mysqld.sock" # SlaveStats true # SlaveNotifications true # @@ -956,14 +956,14 @@ # # Collect "latency" # Collect "udp-answers" "udp-queries" -# Socket "/var/run/pdns.controlsocket" +# Socket "@localstatedir@/run/pdns.controlsocket" # # # Collect "questions" # Collect "cache-hits" "cache-misses" -# Socket "/var/run/pdns_recursor.controlsocket" +# Socket "@localstatedir@/run/pdns_recursor.controlsocket" # -# LocalSocket "/opt/collectd/var/run/collectd-powerdns" +# LocalSocket "@localstatedir@/run/collectd-powerdns" # # @@ -1011,14 +1011,14 @@ # # DaemonAddress "unix:/tmp/rrdcached.sock" -# DataDir "@localstatedir@/lib/@PACKAGE_NAME@/rrd" +# DataDir "@localstatedir@/db/@PACKAGE_NAME@/rrd" # CreateFiles true # CreateFilesAsync false # CollectStatistics true # # -# DataDir "@localstatedir@/lib/@PACKAGE_NAME@/rrd" +# DataDir "@localstatedir@/db/@PACKAGE_NAME@/rrd" # CreateFilesAsync false # CacheTimeout 120 # CacheFlush 900 @@ -1174,7 +1174,7 @@ # Type "kpackets_wire_per_sec.realtime" # ValueFrom 4 # -# +# # Instance "snort-eth0" # Interval 600 # Collect "dropped" "mbps" "alerts" "kpps" @@ -1231,7 +1231,7 @@ # # -# SocketFile "@prefix@/var/run/@PACKAGE_NAME@-unixsock" +# SocketFile "@localstatedir@/run/@PACKAGE_NAME@-unixsock" # SocketGroup "collectd" # SocketPerms "0660" # DeleteSocket false