- rel 4; new way for configuring channels; use sought channel too; more suggests

[packages/spamassassin.git] / spamassassin-spamd.init

diff --git a/spamassassin-spamd.init b/spamassassin-spamd.init
index cc79ba8fb0eb896dd43e5d1c8c7ed0536abfe02e..404ea98be474f8df1cf98f2f07d068d626c1cdee 100644 (file)
--- a/spamassassin-spamd.init
+++ b/spamassassin-spamd.init
@@ -24,51 +24,76 @@ fi
 
 # Check that networking is up.
 if is_no "${NETWORKING}"; then
-       msg_network_down SpamAssassin
+       msg_network_down "SpamAssassin"
        exit 1
 fi
 
 start() {
        # Start daemon.
-       if [ ! -f /var/lock/subsys/spamd ]; then
-               msg_starting SpamAssassin
-               daemon spamd $SPAMD_OPTS
-               RETVAL=$?
-               [ $RETVAL -eq 0 ] && touch /var/lock/subsys/spamd
-       else
-               msg_already_running SpamAssassin
+       if [ -f /var/lock/subsys/spamd ]; then
+               msg_already_running "SpamAssassin"
+               return
        fi
+
+       # Check if database is installed.
+       if [ "$(find /var/lib/spamassassin/ -name '*.cf' | head -n1 | wc -l)" -eq 0 ]; then
+               show 'Spamassassin database not found. Run sa-update first.'; fail
+               return 1
+       fi
+
+       msg_starting "SpamAssassin"
+       daemon /usr/bin/spamd $SPAMD_OPTS
+       RETVAL=$?
+       [ $RETVAL -eq 0 ] && touch /var/lock/subsys/spamd
 }
 
 stop() {
        # Stop daemons.
-       if [ -f /var/lock/subsys/spamd ]; then
-               msg_stopping SpamAssassin
-               killproc spamd
-               RETVAL=$?
-               rm -f /var/lock/subsys/spamd
-       else
-               msg_not_running SpamAssassin
+       if [ ! -f /var/lock/subsys/spamd ]; then
+               msg_not_running "SpamAssassin"
+               return
        fi
+
+       msg_stopping "SpamAssassin"
+       killproc --pidfile spamassassin.pid spamd
+       RETVAL=$?
+       rm -f /var/lock/subsys/spamd
+}
+
+condrestart() {
+       if [ ! -f /var/lock/subsys/spamd ]; then
+               msg_not_running "SpamAssassin"
+               RETVAL=$1
+               return
+       fi
+
+       stop
+       start
 }
 
 # See how we were called.
 case "$1" in
   start)
-       start
+       start
        ;;
   stop)
-       stop
+       stop
        ;;
   restart)
        stop
        start
        ;;
+  try-restart)
+       condrestart 0
+       ;;
+  force-reload)
+       condrestart 7
+       ;;
   status)
        status spamd
        ;;
   *)
-       msg_usage "$0 {start|stop|restart|status}"
+       msg_usage "$0 {start|stop|restart|try-restart|force-reload|status}"
        exit 1
 esac