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

Rewritten-From: 117c2ff886591cc52dee9638841ce5a4aa1b5b15
---
 xenial/debian/changelog                  | 6 ++++++
 xenial/debian/cinder-api.logrotate       | 8 +-------
 xenial/debian/cinder-backup.logrotate    | 8 +-------
 xenial/debian/cinder-scheduler.logrotate | 8 +-------
 xenial/debian/cinder-volume.logrotate    | 8 +-------
 5 files changed, 10 insertions(+), 28 deletions(-)

diff --git a/xenial/debian/changelog b/xenial/debian/changelog
index 14bdd3077..a95ceec18 100644
--- a/xenial/debian/changelog
+++ b/xenial/debian/changelog
@@ -1,3 +1,9 @@
+cinder (2014.1-6) unstable; urgency=medium
+
+  * Switched from restarting daemons to copytruncate in logrotate.
+
+ -- Thomas Goirand <zigo@debian.org>  Thu, 29 May 2014 14:01:00 +0800
+
 cinder (2014.1-5) unstable; urgency=medium
 
   * Disable https for the default keystone conf, as this makes our CI fail.
diff --git a/xenial/debian/cinder-api.logrotate b/xenial/debian/cinder-api.logrotate
index 7ae16ebdb..c7a981e58 100644
--- a/xenial/debian/cinder-api.logrotate
+++ b/xenial/debian/cinder-api.logrotate
@@ -4,11 +4,5 @@
     compress
     delaycompress
     notifempty
-    postrotate
-        if dpkg-vendor --derives-from ubuntu ; then
-            service cinder-api restart >/dev/null 2>&1 || true
-        else
-            invoke-rc.d cinder-api restart >/dev/null 2>&1 || true
-        fi
-    endscript
+    copytruncate
 }
diff --git a/xenial/debian/cinder-backup.logrotate b/xenial/debian/cinder-backup.logrotate
index 2e9043106..68c6d58ba 100644
--- a/xenial/debian/cinder-backup.logrotate
+++ b/xenial/debian/cinder-backup.logrotate
@@ -4,11 +4,5 @@
     compress
     delaycompress
     notifempty
-    postrotate
-        if dpkg-vendor --derives-from ubuntu ; then
-            service cinder-backup restart >/dev/null 2>&1 || true
-        else
-            invoke-rc.d cinder-backup restart >/dev/null 2>&1 || true
-        fi
-    endscript
+    copytruncate
 }
diff --git a/xenial/debian/cinder-scheduler.logrotate b/xenial/debian/cinder-scheduler.logrotate
index b1109e29b..c09beb047 100644
--- a/xenial/debian/cinder-scheduler.logrotate
+++ b/xenial/debian/cinder-scheduler.logrotate
@@ -4,11 +4,5 @@
     compress
     delaycompress
     notifempty
-    postrotate
-        if dpkg-vendor --derives-from ubuntu ; then
-            service cinder-scheduler restart >/dev/null 2>&1 || true
-        else
-            invoke-rc.d cinder-scheduler restart >/dev/null 2>&1 || true
-        fi
-    endscript
+    copytruncate
 }
diff --git a/xenial/debian/cinder-volume.logrotate b/xenial/debian/cinder-volume.logrotate
index f75700d17..1f5fca8d6 100644
--- a/xenial/debian/cinder-volume.logrotate
+++ b/xenial/debian/cinder-volume.logrotate
@@ -4,11 +4,5 @@
     compress
     delaycompress
     notifempty
-    postrotate
-        if dpkg-vendor --derives-from ubuntu ; then
-            service cinder-volume restart >/dev/null 2>&1 || true
-        else
-            invoke-rc.d cinder-volume restart >/dev/null 2>&1 || true
-        fi
-    endscript
+    copytruncate
 }
-- 
2.45.2