X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=debian%2Fspamass-milter.init;h=f875cd4b89367cbc08287b9769a0b451f4d4213f;hb=b2e4b7efa05532e6b55579fb44d0c378b447af44;hp=00904f419445bc01f6794e4d4080e36d33479835;hpb=81eaab6969b0325aad260aafbd36631e846f29de;p=deb_pkgs%2Fspamass-milter.git

diff --git a/debian/spamass-milter.init b/debian/spamass-milter.init
index 00904f4..f875cd4 100644
--- a/debian/spamass-milter.init
+++ b/debian/spamass-milter.init
@@ -30,6 +30,21 @@
 # allow force-reload and options specified in
 # /etc/default/spamass-milter necessary for inclusion in debian.
 
+# It has been modified additionally to support LSB Boot options and
+# status on Friday, July 6, 2007 14:02:44 PDT
+
+
+### BEGIN INIT INFO
+# Provides:          spamass-milter
+# Required-Start:    $syslog $local_fs
+# Required-Stop:     $syslog $local_fs
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: milter for spamassassin
+# Description:       Calls spamassassin to allow filtering out
+#                    spam from ham in libmilter compatible MTAs.
+### END INIT INFO
+
 
 PATH=/sbin:/bin:/usr/sbin:/usr/bin
 NAME=spamass-milter
@@ -40,9 +55,9 @@ DESC="Sendmail milter plugin for SpamAssassin"
 
 DEFAULT=/etc/default/spamass-milter
 OPTIONS=""
-RUNAS="nobody"
+RUNAS="spamass-milter"
 CHUID=""
-SOCKETMODE="0640"
+SOCKETMODE="0600"
 SOCKETOWNER="root:root"
 
 test -x $DAEMON || exit 0
@@ -53,7 +68,7 @@ if [ -e /etc/mail/sendmail.cf ] && egrep -q 'X.+S=local:/var/run/sendmail/spamas
     SOCKETOWNER=""
     RUNAS=""
     echo "WARNING: You are using the old location of spamass.sock. Change your input filter to use";
-    echo "/var/run/spamass/spamass.sock so spamass-milter can run as nobody";
+    echo "/var/run/spamass/spamass.sock so spamass-milter can run as spamass-milter";
 fi;
 
 # If /usr/sbin/postfix exists, set up the defaults for a postfix install
@@ -75,21 +90,27 @@ fi;
 set -e
 
 start() {
-    if [ ! -d $(dirname $SOCKET) ]; then
-	mkdir -p $(dirname $SOCKET);
-	if [ -n "$SOCKETOWNER" ]; then
-	    chown "$SOCKETOWNER" $(dirname $SOCKET);
-	fi;
-    fi;
+    # Because the default socket is in the same location as the
+    # pidfile, we create them in this order.
     if [ ! -d $(dirname $PIDFILE) ]; then
 	mkdir -p $(dirname $PIDFILE);
 	if [ -d $(dirname $PIDFILE) ] && [ -n "$RUNAS" ]; then
 	    chown "$RUNAS" $(dirname $PIDFILE);
 	fi;
     fi;
-    if [ -n "$RUNAS" ] && [ -d $(dirname $PIDFILE); ] && [ "$(stat -c '%U' $(dirname $PIDFILE))" = "$RUNAS" ]; then
-	echo "WARNING: $NAME will run as user $RUNAS but $(dirname $PIDFILE) is not owned by $RUNAS"
-	echo "Either delete this directory or chown it appropriately. Startup attempts may fail."
+    if [ ! -d $(dirname $SOCKET) ]; then
+	mkdir -p $(dirname $SOCKET);
+	if [ -n "$SOCKETOWNER" ]; then
+	    chown "$RUNAS" $(dirname $SOCKET);
+	fi;
+    fi;
+    if [ -n "$RUNAS" ] && [ -d $(dirname $PIDFILE) ] && [ "$(stat -c '%U' $(dirname $PIDFILE))" != "$RUNAS" ]; then
+	echo "WARNING: $NAME will run as user $RUNAS but $(dirname $PIDFILE) is not owned by $RUNAS";
+	echo "Either delete this directory or chown it appropriately. Startup attempts may fail.";
+    fi;
+    if [ -n "$RUNAS" ] && [ -d $(dirname $SOCKET) ] && [ "$(stat -c '%U' $(dirname $SOCKET))" != "$RUNAS" ]; then
+	echo "WARNING: $NAME will run as user $RUNAS but $(dirname $SOCKET) is not owned by $RUNAS";
+	echo "Either delete this directory or chown it appropriately. Startup attempts may fail.";
     fi;
     /bin/rm -f $SOCKET
     start-stop-daemon --start -p $PIDFILE $CHUID --exec $DAEMON -- -P $PIDFILE -f -p $SOCKET $OPTIONS
@@ -103,9 +124,24 @@ start() {
 }
 
 stop(){
-    start-stop-daemon --stop -p $PIDFILE --signal 3 --exec $DAEMON
+    start-stop-daemon --oknodo --stop -p $PIDFILE --signal 3 --exec $DAEMON
     /bin/sleep 5s
     /bin/rm -f $SOCKET
+    /bin/rm -f $PIDFILE
+}
+
+status(){
+    if [ -e $PIDFILE ]; then 
+	if kill -0 $(cat $PIDFILE); then
+	    echo "${NAME} running";
+	    exit 0;
+	else
+	    echo "${NAME} dead but $PIDFILE exists";
+	    exit 1;
+	fi;
+	echo "${NAME} not running";
+	exit 3;
+    fi;
 }
 
 case "$1" in
@@ -125,11 +161,13 @@ case "$1" in
 	stop
 	start
 	echo "${NAME}"
-
+	;;
+  status)
+	status
 	;;
   *)
 	N=$0
-	echo "Usage: $N {start|stop|restart}" >&2
+	echo "Usage: $N {start|stop|restart|force-reload|status}" >&2
 	exit 1
 	;;
 esac