As collectdmon handles its pidfile, this would require to change
COLLECTMONPIDIR to something else than only-root writeable /var/run
Change-Id: I45d2de9dcc976f3b1e18cef5b6b78eeca1d270b2
Signed-off-by: Florian Forster <octo@collectd.org>
service="collectd"
CONFIG=/etc/collectd.conf
COLLECTD=/usr/sbin/collectd
service="collectd"
CONFIG=/etc/collectd.conf
COLLECTD=/usr/sbin/collectd
-COLLECTDMONPID=/var/run/collectdmon.pid
+COLLECTDMONPIDIR="/var/run"
+COLLECTDMONPID="$COLLECTDMONPIDIR/collectdmon.pid"
if [ -r /etc/sysconfig/$service ]; then
. /etc/sysconfig/$service
fi
if [ -r /etc/sysconfig/$service ]; then
. /etc/sysconfig/$service
fi
+if [ ! -d $COLLECTDMONPIDIR ]; then
+ mkdir -p $COLLECTDMONPIDIR
+ [ -n "${RUNAS-}" ] && chown $RUNAS: $COLLECTDMONPIDIR
+fi
+
check_config() {
if test ! -r "$CONFIG"; then
return 2
check_config() {
if test ! -r "$CONFIG"; then
return 2
echo $"not starting due to configuration error"
failure $"not starting $service due to configuration error"
else
echo $"not starting due to configuration error"
failure $"not starting $service due to configuration error"
else
- daemon $prog -P $COLLECTDMONPID -c $COLLECTD -- -C "$CONFIG" $ARGS
+ daemon --user "${RUNAS-root}" $prog -P $COLLECTDMONPID -c $COLLECTD -- -C "$CONFIG" $ARGS
RETVAL=$?
echo
[ $RETVAL -eq 0 ] && touch /var/lock/subsys/$service
RETVAL=$?
echo
[ $RETVAL -eq 0 ] && touch /var/lock/subsys/$service
}
stop () {
echo -n $"Stopping collectd: "
}
stop () {
echo -n $"Stopping collectd: "
+ killproc -p $COLLECTDMONPID $prog
RETVAL=$?
echo
[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$service
RETVAL=$?
echo
[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$service
+ status -p $COLLECTDMONPID $prog
;;
restart|reload)
check_config
;;
restart|reload)
check_config
- [ -f /var/lock/subsys/$prog ] && restart || :
+ [ -f /var/lock/subsys/$service ] && restart || :
;;
*)
echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}"
;;
*)
echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}"