From 721d28649ef8d98e9abbe3a293a3b6011f410691 Mon Sep 17 00:00:00 2001
From: Thomas Goirand <thomas@goirand.fr>
Date: Thu, 29 May 2014 13:51:07 +0800
Subject: [PATCH] Switched from restarting daemons to copytruncate in
 logrotate.

Change-Id: I4028cc52382cdc8342d187dcfec7c3fe77c343c1

Rewritten-From: 16a852000702dd23b325e47b4103bcb6c9f037e5
---
 trusty/debian/ceilometer-agent-central.logrotate      | 8 +-------
 trusty/debian/ceilometer-agent-compute.logrotate      | 8 +-------
 trusty/debian/ceilometer-agent-notification.logrotate | 8 +-------
 trusty/debian/ceilometer-alarm-evaluator.logrotate    | 8 +-------
 trusty/debian/ceilometer-alarm-notifier.logrotate     | 8 +-------
 trusty/debian/ceilometer-api.logrotate                | 8 +-------
 trusty/debian/ceilometer-collector.logrotate          | 8 +-------
 trusty/debian/changelog                               | 6 ++++++
 8 files changed, 13 insertions(+), 49 deletions(-)

diff --git a/trusty/debian/ceilometer-agent-central.logrotate b/trusty/debian/ceilometer-agent-central.logrotate
index f8c51b3..da45c69 100644
--- a/trusty/debian/ceilometer-agent-central.logrotate
+++ b/trusty/debian/ceilometer-agent-central.logrotate
@@ -4,11 +4,5 @@
     compress
     delaycompress
     notifempty
-    postrotate
-        if dpkg-vendor --derives-from ubuntu ; then \
-            service ceilometer-agent-central restart >/dev/null 2>&1 || true ; \
-        else \
-            invoke-rc.d ceilometer-agent-central restart >/dev/null 2>&1 || true ; \
-        fi
-    endscript
+    copytruncate
 }
diff --git a/trusty/debian/ceilometer-agent-compute.logrotate b/trusty/debian/ceilometer-agent-compute.logrotate
index fa6f4cf..581667f 100644
--- a/trusty/debian/ceilometer-agent-compute.logrotate
+++ b/trusty/debian/ceilometer-agent-compute.logrotate
@@ -4,11 +4,5 @@
     compress
     delaycompress
     notifempty
-    postrotate
-        if dpkg-vendor --derives-from ubuntu ; then \
-            service ceilometer-agent-compute restart >/dev/null 2>&1 || true ; \
-        else \
-            invoke-rc.d ceilometer-agent-compute restart >/dev/null 2>&1 || true ; \
-        fi
-    endscript
+    copytruncate
 }
diff --git a/trusty/debian/ceilometer-agent-notification.logrotate b/trusty/debian/ceilometer-agent-notification.logrotate
index ae7c06b..d0b9764 100644
--- a/trusty/debian/ceilometer-agent-notification.logrotate
+++ b/trusty/debian/ceilometer-agent-notification.logrotate
@@ -4,11 +4,5 @@
     compress
     delaycompress
     notifempty
-    postrotate
-        if dpkg-vendor --derives-from ubuntu ; then
-            service ceilometer-agent-notification restart >/dev/null 2>&1 || true
-        else
-            invoke-rc.d ceilometer-agent-notification restart >/dev/null 2>&1 || true
-        fi
-    endscript
+    copytruncate
 }
diff --git a/trusty/debian/ceilometer-alarm-evaluator.logrotate b/trusty/debian/ceilometer-alarm-evaluator.logrotate
index 984c791..6c32cae 100644
--- a/trusty/debian/ceilometer-alarm-evaluator.logrotate
+++ b/trusty/debian/ceilometer-alarm-evaluator.logrotate
@@ -4,11 +4,5 @@
     compress
     delaycompress
     notifempty
-    postrotate
-        if dpkg-vendor --derives-from ubuntu ; then \
-            service ceilometer-alarm-evaluator restart >/dev/null 2>&1 || true ; \
-        else \
-            invoke-rc.d ceilometer-alarm-evaluator restart >/dev/null 2>&1 || true ; \
-        fi
-    endscript
+    copytruncate
 }
diff --git a/trusty/debian/ceilometer-alarm-notifier.logrotate b/trusty/debian/ceilometer-alarm-notifier.logrotate
index ac4f626..f2f4ee6 100644
--- a/trusty/debian/ceilometer-alarm-notifier.logrotate
+++ b/trusty/debian/ceilometer-alarm-notifier.logrotate
@@ -4,11 +4,5 @@
     compress
     delaycompress
     notifempty
-    postrotate
-        if dpkg-vendor --derives-from ubuntu ; then \
-            service ceilometer-alarm-notifier restart >/dev/null 2>&1 || true ; \
-        else \
-            invoke-rc.d ceilometer-alarm-notifier restart >/dev/null 2>&1 || true ; \
-        fi
-    endscript
+    copytruncate
 }
diff --git a/trusty/debian/ceilometer-api.logrotate b/trusty/debian/ceilometer-api.logrotate
index cebd5e0..36e7cf0 100644
--- a/trusty/debian/ceilometer-api.logrotate
+++ b/trusty/debian/ceilometer-api.logrotate
@@ -4,11 +4,5 @@
     compress
     delaycompress
     notifempty
-    postrotate
-        if dpkg-vendor --derives-from ubuntu ; then \
-            service ceilometer-api restart >/dev/null 2>&1 || true ; \
-        else \
-            invoke-rc.d ceilometer-api restart >/dev/null 2>&1 || true ; \
-        fi
-    endscript
+    copytruncate
 }
diff --git a/trusty/debian/ceilometer-collector.logrotate b/trusty/debian/ceilometer-collector.logrotate
index acd6d8e..aa6995e 100644
--- a/trusty/debian/ceilometer-collector.logrotate
+++ b/trusty/debian/ceilometer-collector.logrotate
@@ -4,11 +4,5 @@
     compress
     delaycompress
     notifempty
-    postrotate
-        if dpkg-vendor --derives-from ubuntu ; then \
-            service ceilometer-collector restart >/dev/null 2>&1 || true ; \
-        else \
-            invoke-rc.d ceilometer-collector restart >/dev/null 2>&1 || true ; \
-        fi
-    endscript
+    copytruncate
 }
diff --git a/trusty/debian/changelog b/trusty/debian/changelog
index b52b570..176750c 100644
--- a/trusty/debian/changelog
+++ b/trusty/debian/changelog
@@ -1,3 +1,9 @@
+ceilometer (2014.1-7) unstable; urgency=medium
+
+  * Switched from restarting daemons to copytruncate for logrotate.
+
+ -- Thomas Goirand <zigo@debian.org>  Thu, 29 May 2014 13:51:53 +0800
+
 ceilometer (2014.1-6) unstable; urgency=medium
 
   * Adds Add_aggregator_transformer.patch.
-- 
2.32.3