[icinga-checkins] icinga.org: icinga-core/mfriedrich/core: merge changes from r1.3

git at icinga.org git at icinga.org
Mon Apr 25 16:03:14 CEST 2011


Module: icinga-core
Branch: mfriedrich/core
Commit: f13651b7ce8f1e7d7ec9d1e2766c5fa59f953bdc
URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=f13651b7ce8f1e7d7ec9d1e2766c5fa59f953bdc

Author: Christoph Maser <cmr at financial.com>
Date:   Tue Apr 19 21:44:09 2011 +0200

merge changes from r1.3

---

 icinga.spec |   27 +++++++++++++++------------
 1 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/icinga.spec b/icinga.spec
index 3b839ed..40711b9 100644
--- a/icinga.spec
+++ b/icinga.spec
@@ -11,7 +11,7 @@
 
 Summary: Open Source host, service and network monitoring program
 Name: icinga
-Version: 1.4.0
+Version: 1.3.1
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -38,7 +38,7 @@ also useful for incident or SLA reporting.
 Icinga is written in C and is designed as a background process,
 intermittently running checks on various services that you specify.
 
-The actual service checks are performed by separate plug-in programs
+The actual service checks are performed by separate "plugin" programs
 which return the status of the checks to Icinga.
 
 Icinga is a fork of the nagios project.
@@ -79,7 +79,7 @@ Documentation for %{name}
 
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -qn %{name}-%{version}
 
 # /usr/local/nagios is hardcoded in many places
 %{__perl} -pi.orig -e 's|/usr/local/nagios/var/rw|%{_localstatedir}/nagios/rw|g;' contrib/eventhandlers/submit_check_result
@@ -95,7 +95,7 @@ Documentation for %{name}
     --sysconfdir="%{_sysconfdir}/icinga" \
     --with-cgiurl="/icinga/cgi-bin" \
     --with-command-user="icinga" \
-    --with-command-group="icingacmd" \
+    --with-command-group="icinga-cmd" \
     --with-gd-lib="%{_libdir}" \
     --with-gd-inc="%{_includedir}" \
     --with-htmurl="/icinga" \
@@ -144,14 +144,14 @@ Documentation for %{name}
 mv %{buildroot}%{_sysconfdir}/icinga/ido2db.cfg-sample %{buildroot}%{_sysconfdir}/icinga/ido2db.cfg
 mv %{buildroot}%{_sysconfdir}/icinga/idomod.cfg-sample %{buildroot}%{_sysconfdir}/icinga/idomod.cfg
 
-### copy idutils db-script
+### copy idoutils db-script
 cp -r module/idoutils/db %{buildroot}%{_sysconfdir}/icinga/idoutils
 
 %pre
 # Add icinga user
 /usr/sbin/groupadd 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 || :
+/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 || :
 
 
 %post
@@ -164,8 +164,8 @@ if [ $1 -eq 0 ]; then
 fi
 
 %pre gui
-# Add apacheuser in the icingacmd group
-  /usr/sbin/usermod -a -G icingacmd %{apacheuser}
+# Add apacheuser in the icinga-cmd group
+  /usr/sbin/usermod -a -G icinga-cmd %{apacheuser}
 
 %post idoutils
 /sbin/chkconfig --add ido2db
@@ -202,7 +202,7 @@ fi
 %{logdir}
 %dir %{_localstatedir}/icinga
 %dir %{_localstatedir}/icinga/checkresults
-%attr(2755,icinga,icingacmd) %{_localstatedir}/icinga/rw/
+%attr(2755,icinga,icinga-cmd) %{_localstatedir}/icinga/rw/
 
 %files doc
 %defattr(-,icinga,icinga,-)
@@ -244,7 +244,10 @@ fi
 
 
 %changelog
-* Tue Feb 15 2011 Cheistoph Maser <cmaser at gmx.de> - 1.3.0-2
+* Tue Mar 31 2011 Christoph Maser <cmaser at gmx.de> - 1.3.1-1
+- update for release 1.3.1
+
+* Tue Feb 15 2011 Christoph Maser <cmaser at gmx.de> - 1.3.0-2
 - move cgis to libdir
 - remove suse suppot (packages available at opensuse build system)
 - add doxygen docs
@@ -293,7 +296,7 @@ fi
 - Correct checkconfig --del in idoutils #preun
 
 * Mon Oct 26 2009 Christoph Maser <cmr at financial.com> - 0.8.4-3
-- Use icingacmd group and add apache user to that group instead
+- Use icinga-cmd group and add apache user to that group instead
   of using apachegroup as icinga command group.
 
 * Wed Oct 07 2009 Christoph Maser <cmr at financial.com> - 0.8.4-2





More information about the icinga-checkins mailing list