[Pkg-nagios-changes] [SCM] Debian packaging of icinga-web branch, master, updated. debian/1.7.1-1-15-gb499eed

[Markus Frosch]

The following commit has been merged in the master branch:
commit f4a28815b44c8e763bccdad31862c4b1dbb4e8f0
Author: Markus Frosch <markus at lazyfrosch.de>
Date:   Thu Jun 28 19:23:09 2012 +0200

    moved cache dir to /var/cache/icinga-web and some safe cleanup for the old

diff --git a/debian/icinga-web.dirs b/debian/icinga-web.dirs
index f19a06f..b8f50e1 100644
--- a/debian/icinga-web.dirs
+++ b/debian/icinga-web.dirs
@@ -12,7 +12,7 @@ usr/share/icinga-web/tmpl
 
 usr/lib/icinga-web/bin
 
-var/lib/icinga-web/app/cache
+var/cache/icinga-web
 
 var/log/icinga-web
 
diff --git a/debian/icinga-web.postinst b/debian/icinga-web.postinst
index 36d9e67..cc2f41c 100644
--- a/debian/icinga-web.postinst
+++ b/debian/icinga-web.postinst
@@ -209,6 +209,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/lib/icinga-web/app/cache
+setperm www-data www-data 0770 /var/cache/icinga-web
 
 #DEBHELPER#
diff --git a/debian/icinga-web.postrm b/debian/icinga-web.postrm
index 56433e4..433d5d1 100644
--- a/debian/icinga-web.postrm
+++ b/debian/icinga-web.postrm
@@ -34,7 +34,7 @@ if [ "$1" = "purge" ]; then
     ucf --purge /etc/icinga-web/conf.d/database-web.xml
     rm -f /etc/icinga-web/conf.d/database-ido.xml
     ucf --purge /etc/icinga-web/conf.d/database-ido.xml
-	rm -rf /var/lib/icinga-web/app/cache
+	rm -rf /var/cache/icinga-web
 	rm -rf /var/log/icinga-web
     db_purge
 fi
diff --git a/debian/icinga-web.prerm b/debian/icinga-web.prerm
index fe6cb23..c0a5e70 100644
--- a/debian/icinga-web.prerm
+++ b/debian/icinga-web.prerm
@@ -13,4 +13,9 @@ if [ -x /usr/lib/icinga-web/bin/clearcache.sh ]; then
 	/usr/lib/icinga-web/bin/clearcache.sh
 fi
 
+# remove old cache dir (versions before 1.7.1-2)
+rm -rf /var/lib/icinga-web/app/cache
+[ -d /var/lib/icinga-web/app ] && rmdir /var/lib/icinga-web/app || true
+[ -d /var/lib/icinga-web ] && rmdir /var/lib/icinga-web || true
+
 #DEBHELPER#
diff --git a/debian/rules b/debian/rules
index 86e3415..02e5fd5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,7 +24,7 @@ override_dh_auto_configure:
 	--with-web-absolute-path=/usr/share/icinga-web/pub \
 	--with-web-apache-path="/etc/apache2/conf.d" \
 	--with-web-user="www-data" --with-web-group="www-data" \
-	--with-cache-dir=/var/lib/icinga-web/app/cache \
+	--with-cache-dir=/var/cache/icinga-web \
 	--with-log-dir=/var/log/icinga-web \
 	--with-conf-dir=/etc/icinga-web/conf.d \
 	--with-icinga-bin="/usr/sbin/icinga" \

-- 
Debian packaging of icinga-web