[icinga-checkins] icinga.org: icinga-core/rbartels/cgi-current: - move cgis to libdir

git at icinga.org git at icinga.org
Mon Mar 7 21:58:11 CET 2011


Module: icinga-core
Branch: rbartels/cgi-current
Commit: 7d154dbbb1a3edae62d924a58d027ced379e4fcc
URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=7d154dbbb1a3edae62d924a58d027ced379e4fcc

Author: Christoph Maser <cmr at financial.com>
Date:   Tue Feb 15 12:36:07 2011 +0100

- move cgis to libdir
- remove suse suppot (packages available at opensuse build system)
- add doxygen docs

---

 icinga.spec |   21 ++++++++-------------
 1 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/icinga.spec b/icinga.spec
index 674cab8..e016cea 100644
--- a/icinga.spec
+++ b/icinga.spec
@@ -6,14 +6,8 @@
 
 %define logdir %{_localstatedir}/log/icinga
 
-%if "%{_vendor}" == "suse"
-%define apacheconfdir  %{_sysconfdir}/apache2/conf.d
-%define apacheuser wwwrun
-%endif
-%if "%{_vendor}" == "redhat"
 %define apacheconfdir  %{_sysconfdir}/httpd/conf.d
 %define apacheuser apache
-%endif
 
 Summary: Open Source host, service and network monitoring program
 Name: icinga
@@ -97,7 +91,7 @@ Documentation for %{name}
     --libexecdir="%{_datadir}/icinga" \
     --localstatedir="%{_localstatedir}/icinga" \
     --with-checkresult-dir="%{_localstatedir}/icinga/checkresults" \
-    --sbindir="%{_datadir}/icinga/cgi" \
+    --sbindir="%{_libdir}/icinga/cgi" \
     --sysconfdir="%{_sysconfdir}/icinga" \
     --with-cgiurl="/icinga/cgi-bin" \
     --with-command-user="icinga" \
@@ -171,12 +165,7 @@ fi
 
 %pre gui
 # Add apacheuser in the icingacmd group
-%if "%{_vendor}" == "suse"
-  /usr/sbin/groupmod -A %{apacheuser} icingacmd
-%endif
-%if "%{_vendor}" == "redhat"
   /usr/sbin/usermod -a -G icingacmd %{apacheuser}
-%endif
 
 %post idoutils
 /sbin/chkconfig --add ido2db
@@ -218,12 +207,13 @@ fi
 %files doc
 %defattr(-,icinga,icinga,-)
 %{_datadir}/icinga/docs
+%{_datadir}/icinga/doxygen
 
 %files gui
 %defattr(-,icinga,icinga,-)
 %config(noreplace) %attr(-,root,root) %{apacheconfdir}/icinga.conf
 %dir %{_datadir}/icinga
-%{_datadir}/icinga/cgi
+%{_libdir}/icinga/cgi
 %{_datadir}/icinga/contexthelp
 %{_datadir}/icinga/images
 %{_datadir}/icinga/index.html
@@ -254,6 +244,11 @@ fi
 
 
 %changelog
+* Tue Feb 15 2011 Cheistoph 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
+
 * Wed Nov 03 2010 Michael Friedrich <michael.friedrich at univie.ac.at> - 1.3.0-1
 - prepared 1.3.0, added log2ido for idoutils install
 





More information about the icinga-checkins mailing list