Author: glen                         Date: Fri Mar  6 12:35:21 2009 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- use functions, added try-restart

---- Files affected:
SOURCES:
   mailman.init (1.12 -> 1.13) 

---- Diffs:

================================================================
Index: SOURCES/mailman.init
diff -u SOURCES/mailman.init:1.12 SOURCES/mailman.init:1.13
--- SOURCES/mailman.init:1.12   Fri Feb  3 16:05:54 2006
+++ SOURCES/mailman.init        Fri Mar  6 13:35:15 2009
@@ -6,9 +6,8 @@
 # description: mailman is mailing lists server
 #
 # processname: mailman
-# pidfile:     /var/run/mailman.pid
-# config:      /etc/mailman/mm_cfg.py
-
+# pidfile:     /var/run/mailman/master-qrunner.pid
+# config:      /etc/webapps/mailman/mm_cfg.py
 
 # Source function library
 . /etc/rc.d/init.d/functions
@@ -29,41 +28,67 @@
 # Get service config
 [ -f /etc/sysconfig/mailman ] && . /etc/sysconfig/mailman
 
-RETVAL=0
-# See how we were called.
-case "$1" in
-  start)
+start() {
        # Check if the service is already running?
-       if [ ! -f /var/lock/subsys/mailman ]; then
-               msg_starting mailman
-               daemon --user mailman /usr/lib/mailman/bin/mailmanctl -s -u 
start
-               RETVAL=$?
-               [ $RETVAL -eq 0 ] && touch /var/lock/subsys/mailman
-       else
+       if [ -f /var/lock/subsys/mailman ]; then
                msg_already_running mailman
+               return
        fi
-       ;;
-  stop)
+
+       msg_starting mailman
+       daemon --user mailman /usr/lib/mailman/bin/mailmanctl -s -u start
+       RETVAL=$?
+       [ $RETVAL -eq 0 ] && touch /var/lock/subsys/mailman
+}
+
+stop() {
        # Stop daemons.
+       if [ ! -f /var/lock/subsys/mailman ]; then
+               msg_not_running mailman
+               return
+       fi
+
+       msg_stopping mailman
+       daemon 'su mailman -s /bin/sh -c "/usr/lib/mailman/bin/mailmanctl -u 
stop"'
+       rm -f /var/lock/subsys/mailman /var/run/mailman.pid
+}
+
+condrestart() {
        if [ -f /var/lock/subsys/mailman ]; then
-               msg_stopping mailman
-               daemon 'su mailman -s /bin/sh -c 
"/usr/lib/mailman/bin/mailmanctl -u stop"'
-               rm -f /var/lock/subsys/mailman /var/run/mailman.pid
+               stop
+               start
        else
                msg_not_running mailman
+               RETVAL=$1
        fi
+}
+
+RETVAL=0
+# See how we were called.
+case "$1" in
+  start)
+       start
        ;;
-  status)
-       status mailman qrunner
+  stop)
+       stop
+       ;;
+  restart)
+       stop
+       start
        exit $?
        ;;
-  restart|force-reload)
-       $0 stop
-       $0 start
+  try-restart)
+       condrestart 0
+       ;;
+  force-reload)
+       condrestart 7
+       ;;
+  status)
+       status mailman qrunner
        exit $?
        ;;
   *)
-       msg_usage "$0 {start|stop|restart|force-reload|status}"
+       msg_usage "$0 {start|stop|restart|try-restart|force-reload|status}"
        exit 3
 esac
 
================================================================

---- CVS-web:
    
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/mailman.init?r1=1.12&r2=1.13&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to