- up to 4.66

[packages/exim.git] / exim.init

diff --git a/exim.init b/exim.init
index ebbc1dca85583c37650167da0169533cb79efaf8..03c1735da3afa22fbf053b58eb1de03471fbff7f 100644 (file)
--- a/exim.init
+++ b/exim.init
@@ -7,7 +7,7 @@
 #              that moves mail from one machine to another.
 # processname: exim
 # config:      /etc/exim.cf
-# pidfile:     /var/run/exim.pid
+# pidfile:     /var/spool/exim/exim-daemon.pid
 
 # Source function library.
 . /etc/rc.d/init.d/functions
@@ -16,18 +16,23 @@
 . /etc/sysconfig/network
 
 # Source exim configureation.
-if [ -f /etc/sysconfig/exim ] ; then
+if [ -f /etc/sysconfig/exim ]; then
        . /etc/sysconfig/exim
 else
        QUEUE=1h
 fi
 
 # Check that networking is up.
-if is_no "${NETWORKING}"; then
-       msg_Network_Down Exim
-       exit 1
+if is_yes "${NETWORKING}"; then
+       if [ ! -f /var/lock/subsys/network -a "$1" != stop -a "$1" != status ]; then
+               msg_network_down Exim
+               exit 1
+       fi
+else
+       exit 0
 fi
 
+RETVAL=0
 # See how we were called.
 case "$1" in
   start)
@@ -37,38 +42,51 @@ case "$1" in
                daemon exim \
                        $( is_yes "$ALLOW_TCP_CONNECTIONS" && echo -bd ) \
                        $( [ -n "$QUEUE" ] && echo -q$QUEUE )
+               for CONFIG in $EXIM_EXTRA_CONFIGS; do
+                               msg_starting "Exim ($CONFIG)"
+                               daemon exim \
+                                       $( is_yes "$ALLOW_TCP_CONNECTIONS" && echo -bd ) \
+                                       $( [ -n "$QUEUE" ] && echo -q$QUEUE ) \
+                                       -C $CONFIG
+               done
                RETVAL=$?
                [ $RETVAL -eq 0 ] && touch /var/lock/subsys/exim
        else
-               msg_Already_Running Exim
+               msg_already_running Exim
        fi
        ;;
   stop)
        # Stop daemons.
        if [ -f /var/lock/subsys/exim ]; then
                msg_stopping Exim
-               killproc exim
+               killproc --pidfile /var/spool/exim/exim-daemon.pid exim
                rm -f /var/lock/subsys/exim >/dev/null 2>&1
        else
-               msg_Not_Running Exim
-               exit 1
-       fi      
+               msg_not_running Exim
+       fi
        ;;
   restart)
        $0 stop
        $0 start
+       exit $?
        ;;
   status)
        status exim
+       exit $?
        ;;
-  reload)
-       msg_reloading Exim
-       killproc exim -HUP
+  reload|force-reload)
+       if [ -f /var/lock/subsys/exim ]; then
+               msg_reloading Exim
+               killproc exim -HUP
+               RETVAL=$?
+       else
+               msg_not_running Exim
+               exit 7
+       fi
        ;;
   *)
-       msg_Usage "$0 {start|stop|restart|reload|status}"
-       exit 1
+       msg_usage "$0 {start|stop|restart|reload|force-reload|status}"
+       exit 3
 esac
 
 exit $RETVAL
-