From: Peter A. Bigot <pab@pabigot.com>
Date: Sun, 1 Jun 2014 00:42:41 +0000 (-0500)
Subject: rrdcached-lsb: update to support unprivileged group/user configuration
X-Git-Tag: v1.5.0-rc1~77^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F501%2Fhead;p=thirdparty%2Frrdtool-1.x.git

rrdcached-lsb: update to support unprivileged group/user configuration

Signed-off-by: Peter A. Bigot <pab@pabigot.com>
---

diff --git a/etc/rrdcached-default-lsb.in b/etc/rrdcached-default-lsb.in
index 44e163d1..0ed8e03b 100644
--- a/etc/rrdcached-default-lsb.in
+++ b/etc/rrdcached-default-lsb.in
@@ -34,6 +34,14 @@ SOCKFILE=/var/run/rrdcached.sock
 # Optional override access mode of local control socket.
 #SOCKMODE=0660
 
+# 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
diff --git a/etc/rrdcached-init-lsb b/etc/rrdcached-init-lsb
index b7f4d694..88bb274f 100755
--- a/etc/rrdcached-init-lsb
+++ b/etc/rrdcached-init-lsb
@@ -30,6 +30,8 @@ RRDCACHED_OPTIONS="\
   ${WRITE_THREADS:+-t ${WRITE_THREADS}} \
   ${BASE_PATH:+-b ${BASE_PATH}} \
   ${JOURNAL_PATH:+-j ${JOURNAL_PATH}} \
+  ${DAEMON_GROUP:+-G ${DAEMON_GROUP}} \
+  ${DAEMON_USER:+-U ${DAEMON_USER}} \
   -p ${PIDFILE} \
   ${SOCKFILE:+${SOCKGROUP:+-s ${SOCKGROUP}} ${SOCKMODE:+-m ${SOCKMODE}} -l unix:${SOCKFILE}} \
     "