From eca17e7a5c90d988a2f20d85d22eb614fbe027e4 Mon Sep 17 00:00:00 2001
From: Thomas Goirand <thomas@goirand.fr>
Date: Tue, 7 Oct 2014 13:46:05 +0800
Subject: [PATCH] Using a single unique ceilometer-common logrotate file.

Change-Id: I8b9101817eb2d7532db474ca0f6b0c6c26b8bdbd

Rewritten-From: db4faa0f0e9b886041e0f01c4ae0536e2864b6f5
---
 xenial/debian/ceilometer-agent-central.logrotate          | 8 --------
 xenial/debian/ceilometer-agent-compute.logrotate          | 8 --------
 xenial/debian/ceilometer-agent-ipmi.logrotate             | 8 --------
 xenial/debian/ceilometer-agent-notification.logrotate     | 8 --------
 xenial/debian/ceilometer-alarm-evaluator.logrotate        | 8 --------
 xenial/debian/ceilometer-alarm-notifier.logrotate         | 8 --------
 xenial/debian/ceilometer-collector.logrotate              | 8 --------
 ...ilometer-api.logrotate => ceilometer-common.logrotate} | 2 +-
 xenial/debian/changelog                                   | 6 ++++++
 9 files changed, 7 insertions(+), 57 deletions(-)
 delete mode 100644 xenial/debian/ceilometer-agent-central.logrotate
 delete mode 100644 xenial/debian/ceilometer-agent-compute.logrotate
 delete mode 100644 xenial/debian/ceilometer-agent-ipmi.logrotate
 delete mode 100644 xenial/debian/ceilometer-agent-notification.logrotate
 delete mode 100644 xenial/debian/ceilometer-alarm-evaluator.logrotate
 delete mode 100644 xenial/debian/ceilometer-alarm-notifier.logrotate
 delete mode 100644 xenial/debian/ceilometer-collector.logrotate
 rename xenial/debian/{ceilometer-api.logrotate => ceilometer-common.logrotate} (68%)

diff --git a/xenial/debian/ceilometer-agent-central.logrotate b/xenial/debian/ceilometer-agent-central.logrotate
deleted file mode 100644
index da45c69..0000000
--- a/xenial/debian/ceilometer-agent-central.logrotate
+++ /dev/null
@@ -1,8 +0,0 @@
-/var/log/ceilometer/ceilometer-agent-central.log {
-    daily
-    missingok
-    compress
-    delaycompress
-    notifempty
-    copytruncate
-}
diff --git a/xenial/debian/ceilometer-agent-compute.logrotate b/xenial/debian/ceilometer-agent-compute.logrotate
deleted file mode 100644
index 581667f..0000000
--- a/xenial/debian/ceilometer-agent-compute.logrotate
+++ /dev/null
@@ -1,8 +0,0 @@
-/var/log/ceilometer/ceilometer-agent-compute.log {
-    daily
-    missingok
-    compress
-    delaycompress
-    notifempty
-    copytruncate
-}
diff --git a/xenial/debian/ceilometer-agent-ipmi.logrotate b/xenial/debian/ceilometer-agent-ipmi.logrotate
deleted file mode 100644
index 0ba9cee..0000000
--- a/xenial/debian/ceilometer-agent-ipmi.logrotate
+++ /dev/null
@@ -1,8 +0,0 @@
-/var/log/ceilometer/ceilometer-agent-ipmi.log {
-    daily
-    missingok
-    compress
-    delaycompress
-    notifempty
-    copytruncate
-}
diff --git a/xenial/debian/ceilometer-agent-notification.logrotate b/xenial/debian/ceilometer-agent-notification.logrotate
deleted file mode 100644
index d0b9764..0000000
--- a/xenial/debian/ceilometer-agent-notification.logrotate
+++ /dev/null
@@ -1,8 +0,0 @@
-/var/log/ceilometer/ceilometer-agent-notification.log {
-    daily
-    missingok
-    compress
-    delaycompress
-    notifempty
-    copytruncate
-}
diff --git a/xenial/debian/ceilometer-alarm-evaluator.logrotate b/xenial/debian/ceilometer-alarm-evaluator.logrotate
deleted file mode 100644
index 6c32cae..0000000
--- a/xenial/debian/ceilometer-alarm-evaluator.logrotate
+++ /dev/null
@@ -1,8 +0,0 @@
-/var/log/ceilometer/ceilometer-alarm-evaluator.log {
-    daily
-    missingok
-    compress
-    delaycompress
-    notifempty
-    copytruncate
-}
diff --git a/xenial/debian/ceilometer-alarm-notifier.logrotate b/xenial/debian/ceilometer-alarm-notifier.logrotate
deleted file mode 100644
index f2f4ee6..0000000
--- a/xenial/debian/ceilometer-alarm-notifier.logrotate
+++ /dev/null
@@ -1,8 +0,0 @@
-/var/log/ceilometer/ceilometer-alarm-notifier.log {
-    daily
-    missingok
-    compress
-    delaycompress
-    notifempty
-    copytruncate
-}
diff --git a/xenial/debian/ceilometer-collector.logrotate b/xenial/debian/ceilometer-collector.logrotate
deleted file mode 100644
index aa6995e..0000000
--- a/xenial/debian/ceilometer-collector.logrotate
+++ /dev/null
@@ -1,8 +0,0 @@
-/var/log/ceilometer/ceilometer-collector.log {
-    daily
-    missingok
-    compress
-    delaycompress
-    notifempty
-    copytruncate
-}
diff --git a/xenial/debian/ceilometer-api.logrotate b/xenial/debian/ceilometer-common.logrotate
similarity index 68%
rename from xenial/debian/ceilometer-api.logrotate
rename to xenial/debian/ceilometer-common.logrotate
index 36e7cf0..e7185b7 100644
--- a/xenial/debian/ceilometer-api.logrotate
+++ b/xenial/debian/ceilometer-common.logrotate
@@ -1,4 +1,4 @@
-/var/log/ceilometer/ceilometer-api.log {
+/var/log/ceilometer/*.log {
     daily
     missingok
     compress
diff --git a/xenial/debian/changelog b/xenial/debian/changelog
index fecde82..4fba771 100644
--- a/xenial/debian/changelog
+++ b/xenial/debian/changelog
@@ -1,3 +1,9 @@
+ceilometer (2014.2~rc1-3) experimental; urgency=medium
+
+  * Using a single unique ceilometer-common logrotate file.
+
+ -- Thomas Goirand <zigo@debian.org>  Tue, 07 Oct 2014 13:45:40 +0800
+
 ceilometer (2014.2~rc1-2) experimental; urgency=medium
 
   * Mangling upstream rc and beta versions in watch file.
-- 
2.32.3