Hi,
David Hrbáč wrote:
Michael,
I reviewed your spec file. Looks good to me, so I have committed it.
Just one thing we just discussed about, reviewing the final diff you
just committed. It came up that previous commits were changing the
command group and would break upgrade procedure.
Attached git diff undos that.
Sorry for the inconvenience causing that, I was not aware of that change :(
Thanks,
Michael
PS: If you prefer GIT patches in the future, just let me know. I've just
cloned the git repo and put the patch against master.
--
DI (FH) Michael Friedrich
Vienna University Computer Center
Universitaetsstrasse 7 A-1010 Vienna, Austria
email: michael.friedr...@univie.ac.at
phone: +43 1 4277 14359
mobile: +43 664 60277 14359
fax: +43 1 4277 14338
web: http://www.univie.ac.at/zid
http://www.aco.net
Icinga Core& IDOUtils Developer
http://www.icinga.org
>From 12ab708d6ca37416373ea67e3555b4c07e88ba7e Mon Sep 17 00:00:00 2001
From: Michael Friedrich <michael.friedr...@univie.ac.at>
Date: Wed, 11 May 2011 09:04:52 +0200
Subject: [PATCH] update icinga.spec, re-use icingacmd group instead for icinga-cmd for upgrade reasons
---
specs/icinga/icinga.spec | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/specs/icinga/icinga.spec b/specs/icinga/icinga.spec
index d951bf3..b0c6c74 100644
--- a/specs/icinga/icinga.spec
+++ b/specs/icinga/icinga.spec
@@ -92,7 +92,7 @@ Documentation for %{name}
--sysconfdir="%{_sysconfdir}/icinga" \
--with-cgiurl="/icinga/cgi-bin" \
--with-command-user="icinga" \
- --with-command-group="icinga-cmd" \
+ --with-command-group="icingacmd" \
--with-gd-lib="%{_libdir}" \
--with-gd-inc="%{_includedir}" \
--with-htmurl="/icinga" \
@@ -147,8 +147,8 @@ cp -r module/idoutils/db %{buildroot}%{_sysconfdir}/icinga/idoutils
%pre
# Add icinga user
/usr/sbin/groupadd icinga 2> /dev/null || :
-/usr/sbin/groupadd icinga-cmd 2> /dev/null || :
-/usr/sbin/useradd -c "icinga" -s /sbin/nologin -r -d /var/icinga -G icinga-cmd -g icinga icinga 2> /dev/null || :
+/usr/sbin/groupadd icingacmd 2> /dev/null || :
+/usr/sbin/useradd -c "icinga" -s /sbin/nologin -r -d /var/icinga -G icingacmd -g icinga icinga 2> /dev/null || :
%post
@@ -161,8 +161,8 @@ if [ $1 -eq 0 ]; then
fi
%pre gui
-# Add apacheuser in the icinga-cmd group
- /usr/sbin/usermod -a -G icinga-cmd %{apacheuser}
+# Add apacheuser in the icingacmd group
+ /usr/sbin/usermod -a -G icingacmd %{apacheuser}
%post idoutils
/sbin/chkconfig --add ido2db
@@ -200,7 +200,7 @@ fi
%{logdir}
%dir %{_localstatedir}/icinga
%dir %{_localstatedir}/icinga/checkresults
-%attr(2755,icinga,icinga-cmd) %{_localstatedir}/icinga/rw/
+%attr(2755,icinga,icingacmd) %{_localstatedir}/icinga/rw/
%files doc
%defattr(-,icinga,icinga,-)
@@ -242,6 +242,9 @@ fi
%changelog
+* Wed May 11 2011 Michael Friedrich <michael.friedr...@univie.ac.at> - 1.4.0-2
+- undo changes on icinga-cmd group, use icingacmd like before
+
* Thu Apr 28 2011 Michael Friedrich <michael.friedr...@univie.ac.at> - 1.4.0-1
- update for release 1.4.0
- remove perl subst for eventhandler submit_check_result, this is now done by configure
--
1.7.1.1
_______________________________________________
suggest mailing list
suggest@lists.rpmforge.net
http://lists.rpmforge.net/mailman/listinfo/suggest
