--- icinga 2012-01-16 07:42:34.000000000 +0100
+++ icinga-new 2013-06-01 14:55:10.545363714 +0200
@@ -89,8 +89,8 @@
 check_config () {
   if $DAEMON -v $ICINGACFG >/dev/null 2>&1 ; then
     # First get the user/group etc Icinga is running as
- nagios_user="$(get_config icinga_user)"
- nagios_group="$(get_config icinga_group)"
+ icinga_user="$(get_config icinga_user)"
+ icinga_group="$(get_config icinga_group)"
     log_file="$(get_config log_file)"
     log_dir="$(dirname $log_file)"

@@ -123,7 +123,7 @@
 start () {
   DIRECTORY=$(dirname $THEPIDFILE)
   [ ! -d $DIRECTORY ] && mkdir -p $DIRECTORY
- chown nagios:nagios $DIRECTORY
+ chown $icinga_user:$icinga_group $DIRECTORY

   if ! check_started; then
     if ! check_named_pipe; then