* 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 5bc33606815d8b5c6074bd9639dd0a297327f610..b6d2468f5af6ed74e1647919600ef2a09c78b4e9 100644 (file)
--- 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 248070fa6ec9ec712b37fe4167a2d2e778ec6928..eba53f947b190a888b2858f346d553341621c916 100644 (file)
--- 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 69f9449c8381af553d381f1371c1f2135be60b02..269bf6ce8561e6f625ac5902088e4dc769bebe0e 100644 (file)
--- 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 1da53b923f5633ab4b0a2822d2929b9b97b427c8..e6a632500350297de36de8a4f515a650c6a5b5de 100644 (file)
--- 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 (file)
index 0000000..ee5078c
--- /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 218dff0b9a4881e1add1c8148ffe3c4931fd8dd5..eda4febed2867a7d9db6c06033932671f06e8892 100644 (file)
--- 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 de9e1c4a3663bf5aa9977db8a8b7eea1db33aac0..81bf35d7285a5d6fc48e5bd59aed8dca1ba08863 100644 (file)
--- 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 32b2dbd00d2addf4861fc0a2b14aee52073b31b4..e398e92bb5800d1e78116bee1fe84cdebc876bb7 100644 (file)
--- 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 (file)
index 0000000..f14f6df
--- /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