[Pkg-mailman-hackers] Pkg-mailman commit - rev 166 - branches/pkg-split/core/debian

[Bernd S. Brentrup]

Author: bsb
Date: 2004-06-01 12:09:33 -0600 (Tue, 01 Jun 2004)
New Revision: 166

Modified:
   branches/pkg-split/core/debian/changelog
   branches/pkg-split/core/debian/mailman.logrotate
Log:
Rewrite mailman.logrotate merging stanzas and use mailmanctl reopen
instead of directly signalling process in pidfile.


Modified: branches/pkg-split/core/debian/changelog
===================================================================
--- branches/pkg-split/core/debian/changelog	2004-06-01 17:09:56 UTC (rev 165)
+++ branches/pkg-split/core/debian/changelog	2004-06-01 18:09:33 UTC (rev 166)
@@ -10,8 +10,9 @@
     is a list instead of an integer (closes: #246681).
   * Move user modified templates to /var/lib/mailman/templates/site
     (closes: #199039).
+  * Rewrite logrotate merging stanzas (closes: #235006, #247194).
 
- -- Siggy Brentrup <bsb@debian.org>  Sun, 30 May 2004 18:35:58 +0200
+ -- Siggy Brentrup <bsb@debian.org>  Tue,  1 Jun 2004 19:04:08 +0200
 
 mailman (2.1.4-5) unstable; urgency=high
 

Modified: branches/pkg-split/core/debian/mailman.logrotate
===================================================================
--- branches/pkg-split/core/debian/mailman.logrotate	2004-06-01 17:09:56 UTC (rev 165)
+++ branches/pkg-split/core/debian/mailman.logrotate	2004-06-01 18:09:33 UTC (rev 166)
@@ -1,131 +1,27 @@
-/var/log/mailman/bounce {
-	weekly
-	missingok
-	create 0664 list list
-	rotate 4
-	compress
-	delaycompress
-        postrotate
-            [ -f '/var/run/mailman.pid' ] && kill -HUP $(cat /var/run/mailman.pid) || exit 0
-        endscript
-}
+# $URL$
+# $Id$
 
-/var/log/mailman/digest {
-	monthly
-	missingok
-	create 0664 list list
-	rotate 4
-	compress
-	delaycompress
-        postrotate
-            [ -f '/var/run/mailman.pid' ] && kill -HUP $(cat /var/run/mailman.pid) || exit 0
-        endscript
-}
+# Global options
 
-/var/log/mailman/error {
-	weekly
-	missingok
-	create 0664 list list
-	rotate 4
-	compress
-	delaycompress
-        postrotate
-            [ -f '/var/run/mailman.pid' ] && kill -HUP $(cat /var/run/mailman.pid) || exit 0
-        endscript
-}
+compress
+delaycompress
+missingok
+sharedscripts
+postrotate
+  [ -x /usr/lib/mailman/bin/mailmanctl ] && /usr/lib/mailman/bin/mailmanctl -q reopen || exit 0
+endscript
 
-/var/log/mailman/post {
-	monthly
-	missingok
-	create 0664 list list
-	rotate 12
-	compress
-	delaycompress
-        postrotate
-            [ -f '/var/run/mailman.pid' ] && kill -HUP $(cat /var/run/mailman.pid) || exit 0
-        endscript
-}
-
-/var/log/mailman/smtp-failure {
+/var/log/mailman/qrunner /var/log/mailman/smtp /var/log/mailman/smtp-failure /var/log/mailman/locks /var/log/mailman/fromusenet {
 	daily
-	missingok
-	create 0664 list list
 	rotate 7
-	compress
-	delaycompress
-        postrotate
-            [ -f '/var/run/mailman.pid' ] && kill -HUP $(cat /var/run/mailman.pid) || exit 0
-        endscript
 }
 
-/var/log/mailman/smtp {
-	daily
-	missingok
-	create 0664 list list
-	rotate 7
-	compress
-	delaycompress
-        postrotate
-            [ -f '/var/run/mailman.pid' ] && kill -HUP $(cat /var/run/mailman.pid) || exit 0
-        endscript
+/var/log/mailman/bounce /var/log/mailman/error /var/log/mailman/vette {
+	weekly
+	rotate 4
 }
 
-/var/log/mailman/locks {
-	daily
-	missingok
-	create 0664 list list
-	rotate 7
-	compress
-	delaycompress
-        postrotate
-            [ -f '/var/run/mailman.pid' ] && kill -HUP $(cat /var/run/mailman.pid) || exit 0
-        endscript
-}
-
-/var/log/mailman/fromusenet {
-	daily
-	missingok
-	create 0664 list list
-	rotate 7
-	compress
-	delaycompress
-        postrotate
-            [ -f '/var/run/mailman.pid' ] && kill -HUP $(cat /var/run/mailman.pid) || exit 0
-        endscript
-}
-
-/var/log/mailman/qrunner {
-	daily
-	missingok
-	create 0664 list list
-	rotate 7
-	compress
-	delaycompress
-        postrotate
-            [ -f '/var/run/mailman.pid' ] && kill -HUP $(cat /var/run/mailman.pid) || exit 0
-        endscript
-}
-
-/var/log/mailman/subscribe {
+/var/log/mailman/post /var/log/mailman/subscribe /var/log/mailman/digest {
 	monthly
-	missingok
-	create 0664 list list
 	rotate 12
-	compress
-	delaycompress
-        postrotate
-            [ -f '/var/run/mailman.pid' ] && kill -HUP $(cat /var/run/mailman.pid) || exit 0
-        endscript
 }
-
-/var/log/mailman/vette {
-	weekly
-	missingok
-	create 0664 list list
-	rotate 4
-	compress
-	delaycompress
-        postrotate
-            [ -f '/var/run/mailman.pid' ] && kill -HUP $(cat /var/run/mailman.pid) || exit 0
-        endscript
-}


Property changes on: branches/pkg-split/core/debian/mailman.logrotate
___________________________________________________________________
Name: svn:keywords
   + Id URL