- use functions, add try-restart

Changed files:
    proftpd.init -> 1.10

diff --git a/proftpd.init b/proftpd.init
index c4849d0d788527e5b54d69e5f1d4dff978e47636..bc87061ed8cad3b22f2ea168b967c1bfc9929e98 100644 (file)
--- a/proftpd.init
+++ b/proftpd.init
@@ -29,10 +29,7 @@ else
        exit 0
 fi
 
-RETVAL=0
-# See how we were called.
-case "$1" in
-  start)
+start() {
        # Check if the service is already running?
        if [ ! -f /var/lock/subsys/proftpd ]; then
                msg_starting ProFTPD
@@ -42,8 +39,9 @@ case "$1" in
        else
                msg_already_running ProFTPD
        fi
-       ;;
-  stop)
+}
+
+stop() {
        # Stop daemons.
        if [ -f /var/lock/subsys/proftpd ]; then
                msg_stopping ProFTPD
@@ -52,18 +50,44 @@ case "$1" in
        else
                msg_not_running ProFTPD
        fi
+}
+
+
+condrestart() {
+       if [ -f /var/lock/subsys/proftpd ]; then
+               stop
+               start
+       else
+               msg_not_running proftpd
+               RETVAL=$1
+       fi
+}
+
+RETVAL=0
+# See how we were called.
+case "$1" in
+  start)
+       start
+       ;;
+  stop)
+       stop
+       ;;
+  restart)
+       stop
+       start
+       ;;
+  try-restart)
+       condrestart 0
+       ;;
+  force-reload)
+       condrestart 7
        ;;
   status)
        status proftpd
        exit $?
        ;;
-  restart|force-reload)
-       $0 stop
-       $0 start
-       exit $?
-       ;;
   *)
-       msg_usage "$0 {start|stop|restart|force-reload|status}"
+       msg_usage "$0 {start|stop|restart|try-restart|force-reload|status}"
        exit 3
 esac