Merge branch 'master' into distorted

* master:
  etc/logrotate.conf: Actually rotate log files sometimes.

Conflicts:
	etc/logrotate.conf

diff --git a/etc/logrotate.conf b/etc/logrotate.conf
index 7294f61..ce3c186 100644 (file)
--- a/etc/logrotate.conf
+++ b/etc/logrotate.conf
@@ -2,10 +2,10 @@
 ###
 ### Log rotation configuration for mirrors.
 
-compress
-rotate 31
-minsize 4194304
-daily
-
 /var/lib/mirror/log/*.log {
+       compress
+       rotate 8
+       notifempty
+       weekly
+       create 0644
 }