From 5449e11d98d303ae5669b3f686aa4ff546b1d1dd Mon Sep 17 00:00:00 2001 From: Carlo Landmeter Date: Mon, 14 Nov 2016 17:46:46 +0100 Subject: main/collectd: various changes/fixes run as collectd user (do not run as root) split libs utils and disk (add eudev support) add plugins lvm lua mqtt --- main/collectd/collectd.initd | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) (limited to 'main/collectd/collectd.initd') diff --git a/main/collectd/collectd.initd b/main/collectd/collectd.initd index 9cacf2e0669..4ff1e6442cd 100644 --- a/main/collectd/collectd.initd +++ b/main/collectd/collectd.initd @@ -1,20 +1,17 @@ #!/sbin/openrc-run -DAEMON=/usr/sbin/collectd +COLLECTD_USER=${COLLECTD_USER:-"collectd"} +COLLECTD_GROUP=${COLLECTD_GROUP:-"collectd"} +COLLECTD_ARGS=${COLLECTD_ARGS:-""} +COLLECTD_PIDFILE=${COLLECTD_PIDFILE:-"/run/collectd/collectd.pid"} -depend() { - need net -} - -start() { - ebegin "Starting collectd" - start-stop-daemon --start --exec $DAEMON -- $collectd_options - eend $? -} +command=/usr/sbin/collectd +pidfile="$COLLECTD_PIDFILE" +command_args="${COLLECTD_ARGS} -P $pidfile" +start_stop_daemon_args="--user ${COLLECTD_USER}:${COLLECTD_GROUP}" +retry=${COLLECTD_TERMTIMEOUT:-"TERM/25/KILL/5"} -stop () { - ebegin "Stopping collectd" - start-stop-daemon --stop --exec $DAEMON - eend $? +start_pre() { + checkpath --directory --owner "$COLLECTD_USER":"$COLLECTD_GROUP" \ + --mode 0770 "$(dirname $pidfile)" /var/lib/collectd } - -- cgit v1.2.3