From 0ada08aa85b305ef931298654f7b41a7db28b03b Mon Sep 17 00:00:00 2001
From: Rene Moser <resmo@apache.org>
Date: Mon, 13 Apr 2015 17:59:13 +0200
Subject: [PATCH] CLOUDSTACK-6885: fix logrotate on VR to depend on size

In 6ac06e5e5e3ceed4a3e3a86ea5f82ffb59c266f2 logrotate was changed to run hourly.
Some logrotate configs still have set `daily` only which results in logs not
rotated hourly. The only way to ensure the log is rotated is to use size.

This closes #162

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
---
 systemvm/patches/debian/config/etc/logrotate.d/apache2    | 2 +-
 systemvm/patches/debian/config/etc/logrotate.d/cloud      | 1 +
 systemvm/patches/debian/config/etc/logrotate.d/conntrackd | 1 +
 systemvm/patches/debian/config/etc/logrotate.d/dnsmasq    | 1 +
 systemvm/patches/debian/config/etc/logrotate.d/ppp        | 1 +
 5 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/systemvm/patches/debian/config/etc/logrotate.d/apache2 b/systemvm/patches/debian/config/etc/logrotate.d/apache2
index 14c9675672d..3932c274825 100644
--- a/systemvm/patches/debian/config/etc/logrotate.d/apache2
+++ b/systemvm/patches/debian/config/etc/logrotate.d/apache2
@@ -4,6 +4,6 @@
        rotate 3
        compress
        dateext
-       size=+10M
+       size 10M
        notifempty
 }
diff --git a/systemvm/patches/debian/config/etc/logrotate.d/cloud b/systemvm/patches/debian/config/etc/logrotate.d/cloud
index 5d95942f6a7..82801f1c924 100644
--- a/systemvm/patches/debian/config/etc/logrotate.d/cloud
+++ b/systemvm/patches/debian/config/etc/logrotate.d/cloud
@@ -17,6 +17,7 @@
 /var/log/cloud.log {
         rotate 4
         daily
+        size 10M
         missingok
         notifempty
         compress
diff --git a/systemvm/patches/debian/config/etc/logrotate.d/conntrackd b/systemvm/patches/debian/config/etc/logrotate.d/conntrackd
index 8139191e27f..0229cd7e8c5 100644
--- a/systemvm/patches/debian/config/etc/logrotate.d/conntrackd
+++ b/systemvm/patches/debian/config/etc/logrotate.d/conntrackd
@@ -1,5 +1,6 @@
 /var/log/conntrackd-stats.log {
     daily
+    size 10M
     rotate 2
     missingok
     compress
diff --git a/systemvm/patches/debian/config/etc/logrotate.d/dnsmasq b/systemvm/patches/debian/config/etc/logrotate.d/dnsmasq
index 265459077f1..2f917855190 100644
--- a/systemvm/patches/debian/config/etc/logrotate.d/dnsmasq
+++ b/systemvm/patches/debian/config/etc/logrotate.d/dnsmasq
@@ -1,5 +1,6 @@
 /var/log/dnsmasq.log {
     daily
+    size 10M
     missingok
     rotate 5
     notifempty
diff --git a/systemvm/patches/debian/config/etc/logrotate.d/ppp b/systemvm/patches/debian/config/etc/logrotate.d/ppp
index 7181bc3f934..2004e77ff0f 100644
--- a/systemvm/patches/debian/config/etc/logrotate.d/ppp
+++ b/systemvm/patches/debian/config/etc/logrotate.d/ppp
@@ -1,5 +1,6 @@
 /var/log/ppp-connect-errors {
 	daily
+	size 10M
 	rotate 5
 	missingok
 	notifempty