[icinga-checkins] icinga.org: icinga-core/mfriedrich/ido: icinga.spec: use --enable-cgi-log from upstream instead of manual sed #2365

git at icinga.org git at icinga.org
Sat Feb 25 21:18:03 CET 2012


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

Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Sat Feb 25 20:23:31 2012 +0100

icinga.spec: use --enable-cgi-log from upstream instead of manual sed #2365

refs #2365

---

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

diff --git a/Changelog b/Changelog
index dff7f0b..b53fc19 100644
--- a/Changelog
+++ b/Changelog
@@ -42,6 +42,7 @@ ENHANCEMENTS
 * icinga.spec: put module/idoutils/db into docs instead of manually copying to /etc/icinga/idoutils (thx Michael Gruener) #2357
 * icinga.spec: add README.RHEL README.RHEL.idoutils to upstream, being installed as docs (thx Michael Gruener, Stefan Marx) #2212
 * icinga.spec: use eventhandler configure/make in package creation from #2352 #2363
+* icinga.spec: use --enable-cgi-log from upstream instead of manual sed #2365
 
 FIXES
 * core: Plug some macro leaks triggered when sending notifications (Andreas Ericsson) #2109
diff --git a/icinga.spec b/icinga.spec
index 140ab2c..1e0fc8f 100644
--- a/icinga.spec
+++ b/icinga.spec
@@ -108,6 +108,7 @@ Documentation for %{name}
     --with-httpd-conf=%{apacheconfdir} \
     --with-init-dir=%{_initrddir} \
     --with-log-dir=%{logdir} \
+    --enable-cgi-log \
     --with-cgi-log-dir=%{logdir}/gui \
     --with-plugin-dir="%{_libdir}/nagios/plugins" \
     --with-eventhandler-dir="%{_libdir}/icinga/eventhandlers" \
@@ -134,13 +135,6 @@ 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
@@ -271,6 +265,7 @@ fi
 - add README.RHEL README.RHEL.idoutils to docs, thx Michael Gruener, Stefan Marx #2212
 - use newly introduced --with-eventhandler-dir and make install-eventhandlers
 - install sample eventhandlers to {_libdir}/icinga/eventhandlers
+- use --enable-cgi-log from upstream instead of manual sed
 
 * Fri Feb 24 2012 Michael Friedrich <michael.friedrich at univie.ac.at> - 1.6.1-4
 - rename idomod.o to idomod.so - see #2354





More information about the icinga-checkins mailing list