Rel 2; don't restart mailman on logrotate; use its reopen mechanism instead

diff --git a/mailman.init b/mailman.init
index 9c5c7b73d949933c43b60eb71e2e596209c55589..0da3413430a9105797715310d7770195b8b6ca3d 100755 (executable)
--- a/mailman.init
+++ b/mailman.init
@@ -63,6 +63,16 @@ condrestart() {
        fi
 }
 
+flushlogs() {
+    if [ -f /var/lock/subsys/mailman ]; then
+                daemon --user mailman /usr/lib/mailman/bin/mailmanctl -u reopen > /dev/null
+                RETVAL=$?
+    else
+                msg_not_running "Mailman Qrunner Daemon"
+                RETVAL=1
+    fi
+}
+
 RETVAL=0
 # See how we were called.
 case "$1" in
@@ -82,12 +92,15 @@ case "$1" in
   force-reload)
        condrestart 7
        ;;
+  flush-logs)
+        flushlogs
+        ;;
   status)
        /usr/lib/mailman/bin/mailmanctl status
        exit $?
        ;;
   *)
-       msg_usage "$0 {start|stop|restart|try-restart|force-reload|status}"
+       msg_usage "$0 {start|stop|restart|try-restart|force-reload|status|flush-logs}"
        exit 3
 esac
 

diff --git a/mailman.logrotate b/mailman.logrotate
index bb70bef00ab56b2ea6703f43aa09206a6488778d..e8e64ba8b3e257fb0ddba947cb19f79c98db4535 100644 (file)
--- a/mailman.logrotate
+++ b/mailman.logrotate
@@ -4,6 +4,6 @@
        create 660 mailman mailman
        monthly
        postrotate
-               /sbin/service mailman restart >/dev/null
+               /sbin/service mailman flush-logs
        endscript
 }

diff --git a/mailman.spec b/mailman.spec
index fb71394512afa24230a39aad606def5c42df121d..b2a7ca0ef7a87b07b65fc1f2eb15a89c3cf42c90 100644 (file)
--- a/mailman.spec
+++ b/mailman.spec
@@ -2,7 +2,7 @@
 # Conditional build:
 %bcond_with    umbrella_hack   # break anonimization (for use with moderated umbrella list of moderated lists)
 
-%define                rel     1
+%define                rel     2
 Summary:       The GNU Mailing List Management System
 Summary(es.UTF-8):     El Sistema de Mantenimiento de listas de GNU
 Summary(pl.UTF-8):     System Zarządzania Listami Pocztowymi GNU