From 73d2460e0c80153d5e64fa8ab3c79fa0a9857bbc5b3bdc259ee1bb11c603621c Mon Sep 17 00:00:00 2001
From: Lars Vogdt <lrupp@suse.com>
Date: Tue, 15 Apr 2014 18:10:42 +0000
Subject: [PATCH] use icinga2 also for user/group macros

OBS-URL: https://build.opensuse.org/package/show/server:monitoring/nagios-rpm-macros?expand=0&rev=39
---
 macros.icinga | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/macros.icinga b/macros.icinga
index 4559da7..00cb82c 100644
--- a/macros.icinga
+++ b/macros.icinga
@@ -73,26 +73,26 @@
 #
 
 # User, Icinga runs under
-%icinga_user    icinga
+%icinga2_user    icinga
 # Group, Icinga runs under
-%icinga_group   icinga
+%icinga2_group   icinga
 # User, that can execute commands via %{icinga_command_file}
-%icinga_command_user   wwwrun
+%icinga2_command_user   wwwrun
 # Group, that can execute commands via %{icinga_command_file}
-%icinga_command_group  icingacmd
+%icinga2_command_group  icingacmd
 
 # Add Icinga user and groups
-%icinga_user_group_add() \
- /usr/sbin/groupadd -r %{icinga_group} 2>/dev/null || :\
- /usr/sbin/useradd  -r -g %{icinga_group} -d %{icinga_localstatedir} -s /bin/false -c "User for Icinga" %{icinga_user} 2>/dev/null || :\
+%icinga2_user_group_add() \
+ /usr/sbin/groupadd -r %{icinga2_group} 2>/dev/null || :\
+ /usr/sbin/useradd  -r -g %{icinga2_group} -d %{icinga2_localstatedir} -s /bin/false -c "User for Icinga" %{icinga2_user} 2>/dev/null || :\
  %{nil}
 
-%icinga_command_user_group_add() \
- /usr/sbin/groupadd -r %{icinga_command_group} 2>/dev/null || :\
+%icinga2_command_user_group_add() \
+ /usr/sbin/groupadd -r %{icinga2_command_group} 2>/dev/null || :\
  %if 0%{?suse_version} > 01220 \
- /usr/sbin/usermod -a -G %{icinga_command_group} %{icinga_user} || :\
+ /usr/sbin/usermod -a -G %{icinga2_command_group} %{icinga2_user} || :\
  %else \
- /usr/sbin/groupmod -A %{icinga_user} %{icinga_command_group} 2>/dev/null || :\
+ /usr/sbin/groupmod -A %{icinga2_user} %{icinga2_command_group} 2>/dev/null || :\
  %endif \
  %{nil}