[icinga-checkins] icinga.org: icinga-core/dev/core: icinga.spec: final fixes for 1.6: enable cmd.cgi logging, fix --libexecdir #2123 #2124

git at icinga.org git at icinga.org
Sun Nov 27 13:21:36 CET 2011


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

Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Sun Nov 27 13:17:29 2011 +0100

icinga.spec: final fixes for 1.6: enable cmd.cgi logging, fix --libexecdir #2123 #2124

fixes #2123
fixes #2124

---

 Changelog   |    6 ++++++
 icinga.spec |   23 ++++++++++++++++++-----
 2 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/Changelog b/Changelog
index 50492f4..ed12220 100644
--- a/Changelog
+++ b/Changelog
@@ -40,6 +40,8 @@ ENHANCEMENTS
 
 * config: add config examples for local monitoring - check_procs for ido2db #1870
 
+* icinga.spec: enable cmd.cgi logging by default #2124
+
 FIXES
 * core: fix downtime and comments delete with wrong loop pointers causing segfaults #1979
 * core: fix $NOTIFICATIONRECIPIENTS$ macro contains all contacts assigned to host|service, not only notified contacts #2023
@@ -59,6 +61,8 @@ FIXES
 
 * install: rework the version updates in icinga and idoutils
 
+* icinga.spec: --libexecdir does not point to possible location of nagios-plugins in resource.cfg:$USER1$ #2123
+
 CHANGES
 * package: complete remove icinga-api as module #1935
 	** Development is being discontinued for now, 1.5.0 was last combined release.
@@ -93,6 +97,8 @@ CHANGES
 	** debug_readable_timestamp=0
 	** max_notifications_age, max_contactnotifications_age, max_contactnotificationmethods_age
 
+* icinga.spec
+	** enable cmd.cgi logging by default in rpm
 
 1.5.1 - 09/09/2011
 
diff --git a/icinga.spec b/icinga.spec
index 1bd676b..6ab8a06 100644
--- a/icinga.spec
+++ b/icinga.spec
@@ -32,7 +32,7 @@ BuildRequires: libjpeg-devel
 BuildRequires: libdbi-devel
 BuildRequires: perl(ExtUtils::Embed)
 ### Requires: nagios-plugins
-Provides: nagios
+### Provides: nagios
 
 %description
 Icinga is an application, system and network monitoring application.
@@ -81,7 +81,7 @@ Documentation for %{name}
 %configure \
     --datadir="%{_datadir}/icinga" \
     --datarootdir="%{_datadir}/icinga" \
-    --libexecdir="%{_datadir}/icinga" \
+    --libexecdir="%{_libdir}/nagios/plugins" \
     --localstatedir="%{_localstatedir}/icinga" \
     --with-checkresult-dir="%{_localstatedir}/icinga/checkresults" \
     --sbindir="%{_libdir}/icinga/cgi" \
@@ -130,6 +130,13 @@ Documentation for %{name}
 %{__strip} %{buildroot}%{_bindir}/{icinga,icingastats,log2ido,ido2db}
 %{__strip} %{buildroot}%{_libdir}/icinga/cgi/*.cgi
 
+### enable cmd.cgi logging by default
+%{__perl} -pi -e '
+        s|use_logging.*|use_logging=1|;
+        s|cgi_log_file.*|cgi_log_file=%{logdir}/gui/icinga-cgi.log|;
+        s|cgi_log_archive_path=.*|cgi_log_archive_path=%{logdir}/gui|;
+   ' %{buildroot}%{_sysconfdir}/icinga/cgi.cfg
+
 ### move idoutils sample configs to final 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
@@ -138,7 +145,8 @@ mv %{buildroot}%{_sysconfdir}/icinga/modules/idoutils.cfg-sample %{buildroot}%{_
 ### copy idoutils db-script
 cp -r module/idoutils/db %{buildroot}%{_sysconfdir}/icinga/idoutils
 
-
+### remove icinga-api
+%{__rm} -rf %{buildroot}%{_datadir}/icinga/icinga-api
 
 %pre
 # Add icinga user
@@ -239,9 +247,14 @@ fi
 %{_bindir}/idomod.o
 
 %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
+* Sun Nov 27 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
 - drop api package as this is now deprecated and not shipped anymore with icinga package
+- remove provides nagios, inaccurate
+- enable cmd.cgi logging by default, %{logdir}/gui used
+- fix --libexecdir to point to possible location of nagios-plugins in resource.cfg:$USER1$
 
 * 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





More information about the icinga-checkins mailing list