[icinga-checkins] icinga.org: icinga-core/dev/core: update icinga.spec for 1.6 #2039

git at icinga.org git at icinga.org
Sun Nov 6 10:34:30 CET 2011


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

Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Sun Nov  6 10:33:43 2011 +0100

update icinga.spec for 1.6 #2039

refs #2039

---

 Changelog   |    2 +-
 icinga.spec |    7 +++++++
 2 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/Changelog b/Changelog
index 569e245..1fd7141 100644
--- a/Changelog
+++ b/Changelog
@@ -62,7 +62,7 @@ CHANGES
 * cgi.cfg: extinfo_show_child_hosts=0 added
 * cgi.cfg: authorized_for_full_command_resolution and authorized_contactgroup_for_full_command_resolution added
 
-* add modules/ido2db_check_proc.cfg # 1870
+* add objects/ido2db_check_proc.cfg (not included by default) #1870
 * ido2db.cfg
 	** enable_sla=0
 	** debug_readable_timestamp=0
diff --git a/icinga.spec b/icinga.spec
index 40dde02..a230056 100644
--- a/icinga.spec
+++ b/icinga.spec
@@ -10,6 +10,7 @@
 
 %define apacheconfdir  %{_sysconfdir}/httpd/conf.d
 %define apacheuser apache
+%define apachegroup apache
 
 Summary: Open Source host, service and network monitoring program
 Name: icinga
@@ -96,6 +97,8 @@ Documentation for %{name}
     --with-cgiurl="/icinga/cgi-bin" \
     --with-command-user="icinga" \
     --with-command-group="icingacmd" \
+    --with-web-user=%{apacheuser} \
+    --with-web-group=%{apachegroup} \
     --with-gd-lib="%{_libdir}" \
     --with-gd-inc="%{_includedir}" \
     --with-htmurl="/icinga" \
@@ -239,6 +242,7 @@ fi
 %config(noreplace) %{_sysconfdir}/icinga/ido2db.cfg
 %config(noreplace) %{_sysconfdir}/icinga/idomod.cfg
 %config(noreplace) %{_sysconfdir}/icinga/modules/idoutils.cfg
+%config(noreplace) %{_sysconfdir}/icinga/objects/ido2db_check_proc.cfg
 %{_sysconfdir}/icinga/idoutils
 %{_bindir}/ido2db
 %{_bindir}/log2ido
@@ -255,6 +259,9 @@ fi
 
 
 %changelog
+* Sun Nov 06 2011 Michael Friedrich <michael.friedrich at univie.ac.at> - 1.6.0-1
+- set to 1.6.0 target, add --with-web-user/group, add objects/ido2db_check_proc.cfg
+
 * Wed Jun 29 2011 Michael Friedrich <michael.friedrich at univie.ac.at> - 1.5.0-1
 - set to 1.5.0 target, remove provides nagios version, set idoutils.cfg-sample
 - move all logging to one location https://bugzilla.redhat.com/show_bug.cgi?id=693608





More information about the icinga-checkins mailing list