Debian: Use user/group config also for /run handling in init script.

Also added DAEMON_CMDGROUP var.

Fixes #5309

diff --git a/debian/icinga2-common.icinga2.default b/debian/icinga2-common.icinga2.default
index e5065b4fac90ad8da6d69a698186e288d97dfb55..6df5df10a015ef2557e4312ba8c85b5d03c002a3 100644 (file)
--- a/debian/icinga2-common.icinga2.default
+++ b/debian/icinga2-common.icinga2.default
@@ -3,4 +3,5 @@
 #DAEMON_CONFIG="/etc/icinga2/icinga2.conf"
 #DAEMON_USER=nagios
 #DAEMON_GROUP=nagios
+#DAEMON_CMDGROUP=www-data
 #DAEMON_ARGS="-e /var/log/icinga2/icinga2.err"

diff --git a/debian/icinga2-common.icinga2.init b/debian/icinga2-common.icinga2.init
index f64bb3b1c715e385692fbec5b60992e8a36e54ee..ef14d3b82c4f08fd72cca84ed09863a6f76104e2 100644 (file)
--- a/debian/icinga2-common.icinga2.init
+++ b/debian/icinga2-common.icinga2.init
@@ -20,6 +20,7 @@ DAEMON=/usr/sbin/icinga2
 DAEMON_CONFIG="/etc/icinga2/icinga2.conf"
 DAEMON_USER=nagios
 DAEMON_GROUP=nagios
+DAEMON_CMDGROUP=www-data
 DAEMON_ARGS="-e /var/log/icinga2/icinga2.err"
 PIDFILE=/var/run/icinga2/$NAME.pid
 SCRIPTNAME=/etc/init.d/$NAME
@@ -43,10 +44,10 @@ check_run () {
   test -d '/var/run/icinga2' || mkdir /var/run/icinga2
   test -d '/var/run/icinga2/cmd' || mkdir /var/run/icinga2/cmd
 
-  chown nagios:nagios /var/run/icinga2
+  chown "$DAEMON_USER":"$DAEMON_GROUP" /var/run/icinga2
   chmod 0755 /var/run/icinga2
 
-  chown nagios:www-data /var/run/icinga2/cmd
+  chown "$DAEMON_USER":"$DAEMON_CMDGROUP" /var/run/icinga2/cmd
   chmod 2710 /var/run/icinga2/cmd
 }