X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=debian%2Fspamass-milter.init;h=68d423216a7b5b0b54ab87754a87a18373136fba;hb=77a78f3d2cb6bddd1c2973957c839addc74dd178;hp=18b757f574eeca8d55c60a192a66b110fd10ab41;hpb=809c0976eb899e65ed1460d0dda307f41bfddb04;p=deb_pkgs%2Fspamass-milter.git

diff --git a/debian/spamass-milter.init b/debian/spamass-milter.init
index 18b757f..68d4232 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
@@ -77,27 +92,33 @@ set -e
 start() {
     # 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);
+    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;
-    fi;
-    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
+    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 $SOCKET) ] && [ "$(stat -c '%U' $(dirname $SOCKET))" != "$RUNAS" ]; then
+    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;
-    /bin/rm -f $SOCKET
+    if [ $(dirname $SOCKET) != "." ]; then 
+	/bin/rm -f $SOCKET
+    fi;
     start-stop-daemon --start -p $PIDFILE $CHUID --exec $DAEMON -- -P $PIDFILE -f -p $SOCKET $OPTIONS
     sleep 1s
     if [ -n "$SOCKETMODE" ]; then
@@ -115,6 +136,20 @@ stop(){
     /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
   start)
 	echo -n "Starting $DESC: "
@@ -132,11 +167,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