X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=debian%2Fspamass-milter.init;h=7d114aa4272225725a51c86f6c6b64cabea39d0e;hb=HEAD;hp=a07a729fa0bddf9e46131f21610e3e341249d068;hpb=f425b664c725c2c6a58c2c327aa14ea92fd9e393;p=deb_pkgs%2Fspamass-milter.git

diff --git a/debian/spamass-milter.init b/debian/spamass-milter.init
index a07a729..7d114aa 100644
--- a/debian/spamass-milter.init
+++ b/debian/spamass-milter.init
@@ -30,26 +30,53 @@
 # 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
 DAEMON=/usr/sbin/spamass-milter
-SOCKET=/var/run/sendmail/spamass.sock
-PIDFILE=/var/run/spamass.pid
+SOCKET=/var/run/spamass/spamass.sock
+PIDFILE=/var/run/spamass/spamass.pid
 DESC="Sendmail milter plugin for SpamAssassin"
 
 DEFAULT=/etc/default/spamass-milter
 OPTIONS=""
-RUNAS=""
+RUNAS="spamass-milter"
 CHUID=""
+SOCKETMODE="0600"
+SOCKETOWNER="root:root"
 
 test -x $DAEMON || exit 0
 
+if [ -e /etc/mail/sendmail.cf ] && egrep -q 'X.+S=local:/var/run/sendmail/spamass\.sock' /etc/mail/sendmail.cf; then
+    SOCKET=/var/run/sendmail/spamass.sock
+    SOCKETMODE=""
+    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 spamass-milter";
+fi;
+
 # If /usr/sbin/postfix exists, set up the defaults for a postfix install
 # These can be overridden in /etc/default/spamass-milter
 if [ -x /usr/sbin/postfix ]; then
     SOCKET="/var/spool/postfix/spamass/spamass.sock"
-    RUNAS="postfix:postfix"
-    PIDFILE="/var/spool/postfix/spamass/spamass.pid"
+    SOCKETOWNER="postfix:postfix"
+    SOCKETMODE="0660"
 fi;
 
 if [ -r $DEFAULT ]; then
@@ -62,49 +89,99 @@ fi;
 
 set -e
 
-case "$1" in
-  start)
-	echo -n "Starting $DESC: "
-
-	if [ ! -d $(dirname $SOCKET) ]; then
-	    mkdir -p $(dirname $SOCKET);
+start() {
+    if [ -e $PIDFILE ] && kill -0 $(cat $PIDFILE); then
+        echo "$NAME is already running";
+        exit 1;
+    fi;
+    # 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" $(dirname $SOCKET);
+		chown "$RUNAS" "$DIR";
 	    fi;
 	fi;
-	if [ ! -d $(dirname $PIDFILE) ]; then
-	    mkdir -p $(dirname $PIDFILE);
-	    if [ -n "$RUNAS" ]; then
-		chown "$RUNAS" $(dirname $PIDFILE);
+    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" ] && [ $(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;
+    start-stop-daemon --start -p $PIDFILE $CHUID --exec $DAEMON -- -P $PIDFILE -f -p $SOCKET $OPTIONS
+    sleep 1
+    if [ $(dirname $SOCKET) != "." ]; then
+       if [ -n "$SOCKETMODE" ]; then
+	       chmod $SOCKETMODE $SOCKET;
+       fi;
+       if [ -n "$SOCKETOWNER" ]; then
+	       chown $SOCKETOWNER $SOCKET;
+       fi;
+    fi;
+}
+
+stop(){
+    start-stop-daemon --oknodo --stop -p $PIDFILE --signal 3 --exec $DAEMON
+    /bin/sleep 5
+    if [ $(dirname $SOCKET) != "." ]; then 
+	    /bin/rm -f $SOCKET
+    fi;
+    /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;
 	fi;
-	start-stop-daemon --start -p $PIDFILE $CHUID --exec $DAEMON -- -P $PIDFILE -f -p $SOCKET $OPTIONS
+    echo "${NAME} not running";
+	exit 3;
+}
 
-	echo "${DAEMON}"
+case "$1" in
+  start)
+	echo -n "Starting $DESC: "
+	start
+	echo "${NAME}"
 	;;
   stop)
 	echo -n "Stopping $DESC: "
-
-	start-stop-daemon --stop -p $PIDFILE --signal 3 --exec $DAEMON
-	/bin/sleep 5s
-	/bin/rm -f $SOCKET
-
-	echo "${DAEMON}"
+	stop
+	echo "${NAME}"
 	;;
   force-reload | restart)
 	echo -n "Restarting $DESC: "
 
-	start-stop-daemon --stop -p $PIDFILE --signal 3 --exec $DAEMON
-	/bin/sleep 5s
-	/bin/rm -f $SOCKET
-        start-stop-daemon --start -p $PIDFILE --exec $DAEMON -- -P $PIDFILE -f -p $SOCKET $OPTIONS
-
-        echo "${DAEMON}"
-
+	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