From 495bc5b7336c3d4aec4b9fcd76507cd692f0d523 Mon Sep 17 00:00:00 2001
From: Gunnar Beutner <gunnar.beutner@netways.de>
Date: Tue, 19 Aug 2014 14:02:23 +0200
Subject: [PATCH] Use the icingacmd group for /var/{cache,log,run}/icinga2

refs #6948
---
 etc/initsystem/icinga2-prepare-dirs |  2 +-
 icinga2.spec                        | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/etc/initsystem/icinga2-prepare-dirs b/etc/initsystem/icinga2-prepare-dirs
index 89aaa6416..c9b12491b 100644
--- a/etc/initsystem/icinga2-prepare-dirs
+++ b/etc/initsystem/icinga2-prepare-dirs
@@ -30,4 +30,4 @@ fi
 
 mkdir -p $ICINGA2_RUN_DIR/icinga2/cmd
 chown $ICINGA2_USER:$ICINGA2_COMMAND_GROUP $ICINGA2_RUN_DIR/icinga2/cmd
-chmod 2755 $ICINGA2_RUN_DIR/icinga2/cmd
+chmod 2750 $ICINGA2_RUN_DIR/icinga2/cmd
diff --git a/icinga2.spec b/icinga2.spec
index d21f674a1..09ec10d4a 100644
--- a/icinga2.spec
+++ b/icinga2.spec
@@ -489,19 +489,19 @@ exit 0
 %{_mandir}/man8/%{name}-sign-key.8.gz
 %{_mandir}/man8/%{name}-prepare-dirs.8.gz
 
-%attr(0750,%{icinga_user},%{icinga_group}) %{_localstatedir}/cache/%{name}
-%attr(0750,%{icinga_user},%{icinga_group}) %dir %{_localstatedir}/log/%{name}
-%attr(0750,%{icinga_user},%{icinga_group}) %dir %{_localstatedir}/log/%{name}/compat
-%attr(0750,%{icinga_user},%{icinga_group}) %dir %{_localstatedir}/log/%{name}/compat/archives
+%attr(0750,%{icinga_user},%{icingacmd_group}) %{_localstatedir}/cache/%{name}
+%attr(0750,%{icinga_user},%{icingacmd_group}) %dir %{_localstatedir}/log/%{name}
+%attr(0750,%{icinga_user},%{icingacmd_group}) %dir %{_localstatedir}/log/%{name}/compat
+%attr(0750,%{icinga_user},%{icingacmd_group}) %dir %{_localstatedir}/log/%{name}/compat/archives
 %attr(0750,%{icinga_user},%{icinga_group}) %{_localstatedir}/lib/%{name}
 
-%attr(0750,%{icinga_user},%{icinga_group}) %ghost %{_rundir}/%{name}
+%attr(0750,%{icinga_user},%{icingacmd_group}) %ghost %{_rundir}/%{name}
 %attr(2750,%{icinga_user},%{icingacmd_group}) %ghost %{_rundir}/%{name}/cmd
 
 %files common
 %defattr(-,root,root,-)
 %doc COPYING COPYING.Exceptions README.md NEWS AUTHORS ChangeLog tools/syntax
-%attr(0750,%{icinga_user},%{icinga_group}) %dir %{_localstatedir}/log/%{name}
+%attr(0750,%{icinga_user},%{icingacmd_group}) %dir %{_localstatedir}/log/%{name}
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 %attr(0750,%{icinga_user},%{icinga_group}) %dir %{_localstatedir}/spool/%{name}
 %attr(0750,%{icinga_user},%{icinga_group}) %dir %{_localstatedir}/spool/%{name}/perfdata
-- 
2.40.0