daily autocommit

diff --git a/logrotate.conf b/logrotate.conf
index 9dad9ec534d3411ff004dedf5c4f73b5c3f0373b..9fd367edc362071b882e2285c55bd22e6918b37c 100644 (file)
--- a/logrotate.conf
+++ b/logrotate.conf
@@ -14,6 +14,7 @@ dateext
 # uncomment this if you want your log files compressed
 compress
 delaycompress
+dateformat -%Y-%m-%d
 
 # packages drop log rotation information into this directory
 include /etc/logrotate.d

diff --git a/logrotate.d/alternatives b/logrotate.d/alternatives
index 41c8a9c0a0f0b9836849d374fc0a4356d63fc530..567c5d7528ab1f67e2099483a7d0424a55fa5302 100644 (file)
--- a/logrotate.d/alternatives
+++ b/logrotate.d/alternatives
@@ -6,4 +6,10 @@
        missingok
        notifempty
        create 644 root root
+       size 1M
+       dateext
+       dateformat -%Y-%m-%d
+       olddir /var/log/.old
 }
+
+# vim: ts=4 filetype=conf

diff --git a/logrotate.d/dpkg b/logrotate.d/dpkg
index ee0d3e41906da354e120d6e153183587aa7ea038..20b2b6ecc43922887294980369a911f2ab744003 100644 (file)
--- a/logrotate.d/dpkg
+++ b/logrotate.d/dpkg
@@ -12,18 +12,4 @@
     olddir /var/log/.old
 }
 
-/var/log/alternatives.log {
-    monthly
-    rotate 12
-    compress
-    delaycompress
-    missingok
-    notifempty
-    size 1M
-    create 644 root root
-    dateext
-    dateformat -%Y-%m-%d
-    olddir /var/log/.old
-}
-
 # vim: ts=4 filetype=conf et

diff --git a/logrotate.d/salt-common b/logrotate.d/salt-common
index dcfd268f1fd5685c810ddce12a6818028c80bf45..88313eb7b14d90d83d92d504e622867928af4aa6 100644 (file)
--- a/logrotate.d/salt-common
+++ b/logrotate.d/salt-common
@@ -7,4 +7,5 @@
        rotate 7
        compress
        notifempty
+       minsize 1M
 }