[Pkg-nagios-changes] [SCM] Debian packaging of icinga-web branch, master, updated. debian/1.7.1-4-14-g1c7099f

[Markus Frosch]

The following commit has been merged in the master branch:
commit 1c7099f30db08d3898c4f8053462ec1fa416c93d
Author: Markus Frosch <markus at lazyfrosch.de>
Date:   Fri Sep 14 15:59:15 2012 +0200

    added a cache path for reporting
    
    Please be aware that reporting is disabled by default!
    
    Permissions on the dir /var/cache/icinga-web/reporting might not be
    sufficent. Please use dpkg-override when changing permissions.
    
    Git-Dch: Short
    Closes: 686336
    Thanks: Oskar Liljeblad for suggesting it

diff --git a/debian/icinga-web.dirs b/debian/icinga-web.dirs
index b8f50e1..3a39020 100644
--- a/debian/icinga-web.dirs
+++ b/debian/icinga-web.dirs
@@ -13,6 +13,7 @@ usr/share/icinga-web/tmpl
 usr/lib/icinga-web/bin
 
 var/cache/icinga-web
+var/cache/icinga-web/reporting
 
 var/log/icinga-web
 
diff --git a/debian/icinga-web.postinst b/debian/icinga-web.postinst
index cc2f41c..3b55a97 100644
--- a/debian/icinga-web.postinst
+++ b/debian/icinga-web.postinst
@@ -210,5 +210,6 @@ setperm root www-data 0640 /etc/icinga-web/conf.d/module_reporting.xml
 setperm www-data adm 0770 /var/log/icinga-web
 
 setperm www-data www-data 0770 /var/cache/icinga-web
+setperm www-data www-data 0770 /var/cache/icinga-web/reporting
 
 #DEBHELPER#
diff --git a/debian/rules b/debian/rules
index 02e5fd5..23421ae 100755
--- a/debian/rules
+++ b/debian/rules
@@ -30,7 +30,8 @@ override_dh_auto_configure:
 	--with-icinga-bin="/usr/sbin/icinga" \
 	--with-icinga-cfg="/etc/icinga/icinga.cfg" \
 	--with-icinga-objects-dir="/etc/icinga/objects" \
-	--with-api-cmd-file="/var/lib/icinga/rw/icinga.cmd"
+	--with-api-cmd-file="/var/lib/icinga/rw/icinga.cmd" \
+	--with-reporting_tmp_dir="/var/cache/icinga-web/reporting"
 
 override_dh_auto_build:
 	echo "no build necessary..."

-- 
Debian packaging of icinga-web