[icinga-checkins] icinga.org: icinga-web/mhein/default: use --with-cache-dir in icinga-web. spec with proper location #1985

git at icinga.org git at icinga.org
Thu Nov 17 16:47:10 CET 2011


Module: icinga-web
Branch: mhein/default
Commit: 0e3fba57ee0397fb1f345d8d37c1f26ba44282db
URL:    https://git.icinga.org/?p=icinga-web.git;a=commit;h=0e3fba57ee0397fb1f345d8d37c1f26ba44282db

Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Tue Nov 15 14:36:24 2011 +0100

use --with-cache-dir in icinga-web.spec with proper location #1985

defaults to %{_localstatedir}/cache/icinga-web

refs #1985

---

 icinga-web.spec |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/icinga-web.spec b/icinga-web.spec
index 3c5c918..f2e2270 100644
--- a/icinga-web.spec
+++ b/icinga-web.spec
@@ -4,6 +4,7 @@
 # ExcludeDist: el4 el3
 
 %define logdir %{_localstatedir}/log/icinga-web
+%define cachedir %{_localstatedir}/cache/icinga-web
 
 %if "%{_vendor}" == "suse"
 %define apacheconfdir  %{_sysconfdir}/apache2/conf.d
@@ -18,7 +19,7 @@
 
 Summary: Open Source host, service and network monitoring Web UI
 Name: icinga-web
-Version: 1.5.2
+Version: 1.6.0
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -67,6 +68,7 @@ Icinga Web for Icinga Core, uses Icinga IDOUtils DB as data source.
     --with-web-group='%{apachegroup}' \
     --with-api-cmd-file='%{_localstatedir}/icinga/rw/icinga.cmd' \
     --with-log-dir='%{logdir}' \
+    --with-cache-dir='%{cachedir}' \
     --with-web-apache-path=%{apacheconfdir}
 
 %install
@@ -135,12 +137,16 @@ Icinga Web for Icinga Core, uses Icinga IDOUtils DB as data source.
 %config(noreplace) %{_sysconfdir}/icinga-web/translation.xml
 # logs+cache
 %attr(2775,%{apacheuser},%{apachegroup}) %dir %{logdir}
-%attr(-,%{apacheuser},%{apachegroup}) %{_datadir}/icinga-web/app/cache
-%attr(-,%{apacheuser},%{apachegroup}) %{_datadir}/icinga-web/app/cache/config
+%attr(-,%{apacheuser},%{apachegroup}) %{cachedir}
+%attr(-,%{apacheuser},%{apachegroup}) %{cachedir}/config
 
 ##############################
 %changelog
 ##############################
+* Sat Oct 22 2011 Michael Friedrich <michael.friedrich at univie.ac.at> - 1.6.0-1
+- bump to 1.6.0
+- add --with-cache-dir and use %{_localstatedir}/cache/icinga-web
+
 * Thu Sep 15 2011 Michael Friedrich <michael.friedrich at univie.ac.at> - 1.5.2-1
 - drop icinga-api dependency
 - drop BuildRequires - not needed at this stage





More information about the icinga-checkins mailing list