X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=debian%2Fspamass-milter.init;h=b94fd43e70339048e9bb642dfbfce22b91f26cc3;hb=9663a5b6a8a216033d8ee3d5c64fc72b9fcb6972;hp=8557977638b27393ce6fc0f241180b8773a9daaf;hpb=846080217e2420200ca9d0cfde64d45e1c565a95;p=deb_pkgs%2Fspamass-milter.git

diff --git a/debian/spamass-milter.init b/debian/spamass-milter.init
index 8557977..b94fd43 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 $remote_fs
+# Required-Stop:     $syslog $local_fs $remote_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,23 +90,39 @@ fi;
 set -e
 
 start() {
-    if [ ! -d $(dirname $SOCKET) ]; then
-	mkdir -p $(dirname $SOCKET);
-	if [ -n "$SOCKETOWNER" ]; then
-	    chown "$SOCKETOWNER" $(dirname $SOCKET);
-	fi;
+    if status; then
+        echo "$NAME is already running";
+        exit 1;
     fi;
-    if [ ! -d $(dirname $PIDFILE) ]; then
-	mkdir -p $(dirname $PIDFILE);
-	if [ -d $(dirname $PIDFILE) ] && [ -n "$RUNAS" ]; then
-	    chown "$RUNAS" $(dirname $PIDFILE);
+    # Because the default socket is in the same location as the
+    # pidfile, we create them in this order.
+    for DIR in "$(dirname $PIDFILE)" "$(dirname $SOCKET)"; do 
+    # if the dirname is '.', then it's some kind of odd socket, like
+    # an inet socket. Don't create the directory in such a case
+	if [ "$DIR" != "." ] && [ ! -d "$DIR" ]; then
+	    mkdir -p "$DIR";
+	    if [ -x /sbin/restorecon ]; then 
+		/sbin/restorecon "$DIR";
+	    fi;
+	    if [ -n "$RUNAS" ]; then
+		chown "$RUNAS" "$DIR";
+	    fi;
 	fi;
+    done;
+    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 $PIDFILE) ] && [ "$(stat -c '%U' $(dirname $PIDFILE))" = "$RUNAS" ]; thenx
-	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 [ -n "$RUNAS" ] && [ $(dirname $SOCKET) != "." ] &&
+	[ -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;
+    if [ $(dirname $SOCKET) != "." ]; then 
+	/bin/rm -f $SOCKET
     fi;
-    /bin/rm -f $SOCKET
     start-stop-daemon --start -p $PIDFILE $CHUID --exec $DAEMON -- -P $PIDFILE -f -p $SOCKET $OPTIONS
     sleep 1s
     if [ -n "$SOCKETMODE" ]; then
@@ -103,9 +134,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 +171,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