From: Thomas Goirand <thomas@goirand.fr>
Date: Mon, 3 Feb 2014 08:54:02 +0000 (+0800)
Subject: logrotate script on a single line
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=8b91be350283273863e8c31088d4886c8de92852;p=openstack-build%2Fceilometer-build.git

logrotate script on a single line

Change-Id: Ic489302cbc26ca1beee76787888427208f4e63a6
(cherry picked from commit aaffcc820234c87b1c9691bfe08dd06b0b758cb6)

Rewritten-From: aedeb6e8813a82dd6757c6e500b8506fdadcd9b7
---

diff --git a/trusty/debian/ceilometer-agent-central.logrotate b/trusty/debian/ceilometer-agent-central.logrotate
index a24b992..f8c51b3 100644
--- a/trusty/debian/ceilometer-agent-central.logrotate
+++ b/trusty/debian/ceilometer-agent-central.logrotate
@@ -5,10 +5,10 @@
     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
+        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
 }
diff --git a/trusty/debian/ceilometer-agent-compute.logrotate b/trusty/debian/ceilometer-agent-compute.logrotate
index e67ec38..fa6f4cf 100644
--- a/trusty/debian/ceilometer-agent-compute.logrotate
+++ b/trusty/debian/ceilometer-agent-compute.logrotate
@@ -5,10 +5,10 @@
     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
+        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
 }
diff --git a/trusty/debian/ceilometer-alarm-evaluator.logrotate b/trusty/debian/ceilometer-alarm-evaluator.logrotate
index ef8d51a..984c791 100644
--- a/trusty/debian/ceilometer-alarm-evaluator.logrotate
+++ b/trusty/debian/ceilometer-alarm-evaluator.logrotate
@@ -5,10 +5,10 @@
     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
+        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
 }
diff --git a/trusty/debian/ceilometer-alarm-notifier.logrotate b/trusty/debian/ceilometer-alarm-notifier.logrotate
index 4fd3d66..ac4f626 100644
--- a/trusty/debian/ceilometer-alarm-notifier.logrotate
+++ b/trusty/debian/ceilometer-alarm-notifier.logrotate
@@ -5,10 +5,10 @@
     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
+        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
 }
diff --git a/trusty/debian/ceilometer-api.logrotate b/trusty/debian/ceilometer-api.logrotate
index ef44d76..cebd5e0 100644
--- a/trusty/debian/ceilometer-api.logrotate
+++ b/trusty/debian/ceilometer-api.logrotate
@@ -5,10 +5,10 @@
     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
+        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
 }
diff --git a/trusty/debian/ceilometer-collector.logrotate b/trusty/debian/ceilometer-collector.logrotate
index 0942166..acd6d8e 100644
--- a/trusty/debian/ceilometer-collector.logrotate
+++ b/trusty/debian/ceilometer-collector.logrotate
@@ -5,10 +5,10 @@
     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
+        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
 }