From: Thomas Goirand <zigo@debian.org>
Date: Wed, 3 Jun 2015 12:58:02 +0000 (+0200)
Subject: * Purges correctly log files on purge.
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=3a74e25875d3143ef633b315dcf83fe1f7ba5e5b;p=openstack-build%2Fheat-build.git

* Purges correctly log files on purge.
* Removes double definition of PATH= in init scripts.

Rewritten-From: 904f2986451f0d4bff5f4dc3af64bcc0f9a2d841
---

diff --git a/trusty/debian/changelog b/trusty/debian/changelog
index 5bc33606..b6d2468f 100644
--- a/trusty/debian/changelog
+++ b/trusty/debian/changelog
@@ -1,8 +1,10 @@
-heat (2015.1.0-3) UNRELEASED; urgency=medium
+heat (2015.1.0-3) unstable; urgency=medium
 
   * Replaced && by ; in debian/rules.
+  * Purges correctly log files on purge.
+  * Removes double definition of PATH= in init scripts.
 
- -- Thomas Goirand <zigo@debian.org>  Wed, 03 Jun 2015 11:40:02 +0200
+ -- Thomas Goirand <zigo@debian.org>  Wed, 03 Jun 2015 14:57:22 +0200
 
 heat (2015.1.0-2) unstable; urgency=medium
 
diff --git a/trusty/debian/heat-api-cfn.init.in b/trusty/debian/heat-api-cfn.init.in
index 248070fa..eba53f94 100644
--- a/trusty/debian/heat-api-cfn.init.in
+++ b/trusty/debian/heat-api-cfn.init.in
@@ -12,7 +12,6 @@
 # Author: Thomas Goirand <zigo@debian.or>
 
 # PATH should only include /usr/* if it runs after the mountnfs.sh script
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
 DESC="Heat API CFN"
 PROJECT_NAME=heat
 NAME=${PROJECT_NAME}-api-cfn
diff --git a/trusty/debian/heat-api-cfn.postrm b/trusty/debian/heat-api-cfn.postrm
index 69f9449c..269bf6ce 100644
--- a/trusty/debian/heat-api-cfn.postrm
+++ b/trusty/debian/heat-api-cfn.postrm
@@ -3,7 +3,7 @@
 set -e
 
 if [ "${1}" = "purge" ] ; then
-	rm -rf /var/log/heat/api-cfn*
+	rm -rf /var/log/heat/heat-api-cfn*
 	[ -d /var/log/heat ] && rmdir --ignore-fail-on-non-empty /var/log/heat
 fi
 
diff --git a/trusty/debian/heat-api-cloudwatch.init.in b/trusty/debian/heat-api-cloudwatch.init.in
index 1da53b92..e6a63250 100644
--- a/trusty/debian/heat-api-cloudwatch.init.in
+++ b/trusty/debian/heat-api-cloudwatch.init.in
@@ -12,7 +12,6 @@
 # Author: Thomas Goirand <zigo@debian.or>
 
 # PATH should only include /usr/* if it runs after the mountnfs.sh script
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
 DESC="Heat API Cloud Watch"
 PROJECT_NAME=heat
 NAME=${PROJECT_NAME}-api-cloudwatch
diff --git a/trusty/debian/heat-api-cloudwatch.postrm b/trusty/debian/heat-api-cloudwatch.postrm
new file mode 100644
index 00000000..ee5078cd
--- /dev/null
+++ b/trusty/debian/heat-api-cloudwatch.postrm
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+set -e
+
+if [ "${1}" = "purge" ] ; then
+	rm -rf /var/log/heat/heat-api-cloudwatch.*
+	[ -d /var/log/heat ] && rmdir --ignore-fail-on-non-empty /var/log/heat
+fi
+
+#DEBHELPER#
+
+exit 0
diff --git a/trusty/debian/heat-api.init.in b/trusty/debian/heat-api.init.in
index 218dff0b..eda4febe 100644
--- a/trusty/debian/heat-api.init.in
+++ b/trusty/debian/heat-api.init.in
@@ -12,7 +12,6 @@
 # Author: Thomas Goirand <zigo@debian.or>
 
 # PATH should only include /usr/* if it runs after the mountnfs.sh script
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
 DESC="Heat API"
 PROJECT_NAME=heat
 NAME=${PROJECT_NAME}-api
diff --git a/trusty/debian/heat-api.postrm b/trusty/debian/heat-api.postrm
index de9e1c4a..81bf35d7 100644
--- a/trusty/debian/heat-api.postrm
+++ b/trusty/debian/heat-api.postrm
@@ -5,7 +5,7 @@ set -e
 if [ "${1}" = "purge" ] ; then
 	rm -f /etc/heat/heat-api.conf
 	[ -d /etc/heat ] && rmdir --ignore-fail-on-non-empty /etc/heat
-	rm -rf /var/log/heat/api.*
+	rm -rf /var/log/heat/heat-api.*
 	[ -d /var/log/heat ] && rmdir --ignore-fail-on-non-empty /var/log/heat
 fi
 
diff --git a/trusty/debian/heat-engine.init.in b/trusty/debian/heat-engine.init.in
index 32b2dbd0..e398e92b 100644
--- a/trusty/debian/heat-engine.init.in
+++ b/trusty/debian/heat-engine.init.in
@@ -12,7 +12,6 @@
 # Author: Thomas Goirand <zigo@debian.or>
 
 # PATH should only include /usr/* if it runs after the mountnfs.sh script
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
 DESC="Heat Engine"
 PROJECT_NAME=heat
 NAME=${PROJECT_NAME}-engine
diff --git a/trusty/debian/heat-engine.postrm b/trusty/debian/heat-engine.postrm
new file mode 100644
index 00000000..f14f6df3
--- /dev/null
+++ b/trusty/debian/heat-engine.postrm
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+set -e
+
+if [ "${1}" = "purge" ] ; then
+	[ -d /etc/heat ] && rmdir --ignore-fail-on-non-empty /etc/heat
+	rm -rf /var/log/heat/heat-engine.*
+	[ -d /var/log/heat ] && rmdir --ignore-fail-on-non-empty /var/log/heat
+fi
+
+#DEBHELPER#
+
+exit 0