Now using a single cinder-common.logrotate file instead of so many.

diff --git a/debian/changelog b/debian/changelog
index 2c004e15a96c9ee09babad4e3006d6d019effe18..028928a22ea4ed54545efcadb8b091d000fdae0c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ cinder (2014.2~rc1-2) UNRELEASED; urgency=medium
 
   * Switching to templated init scripts using openstack-pkg-tools >= 13.
   * Mangling upstream rc and beta versions in watch file.
+  * Now using a single cinder-common.logrotate file instead of so many.
 
  -- Thomas Goirand <zigo@debian.org>  Sun, 05 Oct 2014 14:23:48 +0800
 

diff --git a/debian/cinder-backup.logrotate b/debian/cinder-backup.logrotate
deleted file mode 100644 (file)
index 68c6d58..0000000
--- a/debian/cinder-backup.logrotate
+++ /dev/null
@@ -1,8 +0,0 @@
-/var/log/cinder/cinder-backup.log {
-    daily
-    missingok
-    compress
-    delaycompress
-    notifempty
-    copytruncate
-}

diff --git a/debian/cinder-api.logrotate b/debian/cinder-common.logrotate
similarity index 72%
rename from debian/cinder-api.logrotate
rename to debian/cinder-common.logrotate
index c7a981e583228230a2b0ff875539fa3cca7398c9..f96b1b8bbe737ef6db477a1c58a80ec5a241b75f 100644 (file)
--- a/debian/cinder-api.logrotate
+++ b/debian/cinder-common.logrotate
@@ -1,4 +1,4 @@
-/var/log/cinder/cinder-api.log {
+/var/log/cinder/*.log {
     daily
     missingok
     compress

diff --git a/debian/cinder-scheduler.logrotate b/debian/cinder-scheduler.logrotate
deleted file mode 100644 (file)
index c09beb0..0000000
--- a/debian/cinder-scheduler.logrotate
+++ /dev/null
@@ -1,8 +0,0 @@
-/var/log/cinder/cinder-scheduler.log {
-    daily
-    missingok
-    compress
-    delaycompress
-    notifempty
-    copytruncate
-}

diff --git a/debian/cinder-volume.logrotate b/debian/cinder-volume.logrotate
deleted file mode 100644 (file)
index 1f5fca8..0000000
--- a/debian/cinder-volume.logrotate
+++ /dev/null
@@ -1,8 +0,0 @@
-/var/log/cinder/cinder-volume.log {
-    daily
-    missingok
-    compress
-    delaycompress
-    notifempty
-    copytruncate
-}