Update rrdcached configuration for Ubuntu 16.04

diff --git a/cookbooks/munin/templates/default/rrdcached.erb b/cookbooks/munin/templates/default/rrdcached.erb
index 72f9e6fcce381d1a95884025d9d2f47524fffa0c..8d2ae8a04f5ab6a8bc2731c1f01ab0505ca88cba 100644 (file)
--- a/cookbooks/munin/templates/default/rrdcached.erb
+++ b/cookbooks/munin/templates/default/rrdcached.erb
@@ -1,20 +1,57 @@
 # DO NOT EDIT - This file is being maintained by Chef
 
-# 0: start rrdcached on boot, 1: do not start rrdcached on boot
-# default: 0
-DISABLE=0
-
-# options to be passed to rrdcached
-# (do not specify -p <pidfile> - this is handled by the init script)
-# default: see /etc/init.d/rrdcached
-OPTS="-s munin -m 666 -l unix:/var/run/rrdcached.sock -w 1800 -z 1800 -j /var/lib/munin/rrdcached -F -b /var/lib/munin -B"
-
-# number of seconds to wait for rrdcached to shut down
-# (writing the data to disk may take some time;
-# tune this according to your setup)
-# default: 30
-MAXWAIT=30
-
-# 0: do not enable core-files, 1: enable core-files ... if rrdcached crashes
-# default: 0
-ENABLE_COREFILES=0
+# Full path to daemon
+DAEMON=/usr/bin/rrdcached
+
+# Optional override flush interval, in seconds.
+WRITE_TIMEOUT=1800
+
+# Optional override maximum write delay, in seconds.
+WRITE_JITTER=1800
+
+# Optional override number of write_threads
+#WRITE_THREADS=4
+
+# Where database files are placed.  If left unset, the default /tmp will
+# be used.  NB: The daemon will reject a directory that has symlinks as
+# components.  NB: You may want to have -B in BASE_OPTS.
+BASE_PATH=/var/lib/munin/
+
+# Where journal files are placed.  If left unset, journaling will
+# be disabled.
+JOURNAL_PATH=/var/lib/munin/rrdcached/
+
+# FHS standard placement for process ID file.
+PIDFILE=/var/run/rrdcached.pid
+
+# FHS standard placement for local control socket.
+SOCKFILE=/var/run/rrdcached.sock
+
+# Optional override group that should own/access the local control
+# socket
+SOCKGROUP=munin
+
+# Optional override access mode of local control socket.
+SOCKMODE=0666
+
+# Optional unprivileged group to run under when daemon.  If unset
+# retains invocation group privileges.
+#DAEMON_GROUP=_rrdcached
+
+# Optional unprivileged user to run under when daemon.  If unset
+# retains invocation user privileges.
+#DAEMON_USER=_rrdcached
+
+# Network socket address requests.  Use in conjunction with SOCKFILE to
+# also listen on INET domain sockets.  The option is a lower-case ell
+# ASCII 108 = 0x6c, and should be repeated for each address.  The
+# parameter is an optional IP address, followed by an optional port with
+# a colon separating it from the address.  The empty string is
+# interpreted as "open sockets on the default port on all available
+# interfaces", but generally does not pass through init script functions
+# so use -L with no parameters for that configuration.
+#NETWORK_OPTIONS="-L"
+
+# Any other options not specifically supported by the script (-P, -f,
+# -F, -B).
+BASE_OPTIONS="-F -B"