Switched from restarting daemons to copytruncate in logrotate.

Change-Id: I4028cc52382cdc8342d187dcfec7c3fe77c343c1

Rewritten-From: 16a852000702dd23b325e47b4103bcb6c9f037e5

diff --git a/trusty/debian/ceilometer-agent-central.logrotate b/trusty/debian/ceilometer-agent-central.logrotate
index f8c51b3c19a3ab8fd07ec2491fe4903a8dee558d..da45c69d38209898243c1c04e954c89bba2dc6ec 100644 (file)
--- 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 fa6f4cf42e79c66dd346195f6796c39d7796f580..581667f66085c1f210f7516d1295b2ea30078cb4 100644 (file)
--- 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 ae7c06bba953c3c248712dbc2d6abe0b016ed190..d0b976456484672995d9f2e6eafa1b510e5e09ca 100644 (file)
--- 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 984c791258a453d815b4b33cb7d550002d3840e2..6c32cae23ebfd485edc8c3361818df750666b088 100644 (file)
--- 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 ac4f626ebbabc00f29de36858c4779a8849384c5..f2f4ee6ce286fef810ff4864abd1c5544938ba23 100644 (file)
--- 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 cebd5e0ac93d9609570f23b055cdd16ff29b9b2a..36e7cf073268002493026603f0448afd3524a2b7 100644 (file)
--- 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 acd6d8e3806bb3301e5b3f2476e9f891a6bb00d2..aa6995e0c24bb40bcc09005b210650549126e98d 100644 (file)
--- 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 b52b5702c4d9b4c91c21660127595880d6a39dd7..176750cec9c994234d0189b9b1ec34f5091ae876 100644 (file)
--- 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.