From 76c0ce374d4f3d8387ef28c3855ff7d518a3b006 Mon Sep 17 00:00:00 2001
From: Brendan Burns <bburns@google.com>
Date: Thu, 11 Sep 2014 15:47:06 -0700
Subject: [PATCH] Start log rolling for docker containers too. Fix logrotate
 for other daemons.

---
 cluster/saltbase/salt/logrotate/conf     |  2 +-
 cluster/saltbase/salt/logrotate/docker   | 10 ++++++++++
 cluster/saltbase/salt/logrotate/init.sls |  9 +++++++++
 3 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 cluster/saltbase/salt/logrotate/docker

diff --git a/cluster/saltbase/salt/logrotate/conf b/cluster/saltbase/salt/logrotate/conf
index 85d15382b0c..fcd2a676c1c 100644
--- a/cluster/saltbase/salt/logrotate/conf
+++ b/cluster/saltbase/salt/logrotate/conf
@@ -4,7 +4,7 @@
     missingok
     notifempty
     compress
-    maxsize 100m
+    maxsize 100M
     daily
     create 0644 root root
 }
diff --git a/cluster/saltbase/salt/logrotate/docker b/cluster/saltbase/salt/logrotate/docker
new file mode 100644
index 00000000000..8809851cd51
--- /dev/null
+++ b/cluster/saltbase/salt/logrotate/docker
@@ -0,0 +1,10 @@
+/var/lib/docker/containers/*/*-json.log {
+    rotate 5
+    copytruncate
+    missingok
+    notifempty
+    compress
+    maxsize 10M
+    daily
+    create 0644 root root
+}
diff --git a/cluster/saltbase/salt/logrotate/init.sls b/cluster/saltbase/salt/logrotate/init.sls
index cd66cf9f4f1..656a7d39405 100644
--- a/cluster/saltbase/salt/logrotate/init.sls
+++ b/cluster/saltbase/salt/logrotate/init.sls
@@ -16,6 +16,15 @@ logrotate:
       file: {{ file }}
 {% endfor %}
 
+/etc/logrotate.d/docker:
+  file:
+    - managed
+    - source: salt://logrotate/docker
+    - template: jinja
+    - user: root
+    - group: root
+    - mode: 644
+
 /etc/cron.hourly/logrotate:
   file:
     - managed