X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=debian%2Fspamass-milter.init;h=c982b280da9a4365c81fe2cdc7d9817126a97721;hb=1b9d769dc7ca1a44bb9fe5f9fca0045eb5341369;hp=fcb8611cf3c1008dc938d02ab2af5c81c30de5f1;hpb=b710828435b1f296a81fb7f239b64ce7a1b3e9b8;p=deb_pkgs%2Fspamass-milter.git

diff --git a/debian/spamass-milter.init b/debian/spamass-milter.init
index fcb8611..c982b28 100644
--- a/debian/spamass-milter.init
+++ b/debian/spamass-milter.init
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $Id: spamass-milter,v 1.4 2002/07/24 16:19:53 dnelson Exp $
+# $Id$
 #
 # Sample init script for Debian GNU/Linux
 #
@@ -32,48 +32,106 @@
 
 
 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="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"
+    SOCKETOWNER="postfix:postfix"
+    SOCKETMODE="0660"
+fi;
+
 if [ -r $DEFAULT ]; then
     . $DEFAULT;
 fi;
 
+if [ -n "$RUNAS" ]; then
+    CHUID="--chuid $RUNAS";
+fi;
+
 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);
+	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
+	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
+    sleep 1s
+    if [ -n "$SOCKETMODE" ]; then
+	chmod $SOCKETMODE $SOCKET;
+    fi;
+    if [ -n "$SOCKETOWNER" ]; then
+	chown $SOCKETOWNER $SOCKET;
+    fi;
+}
+
+stop(){
+    start-stop-daemon --stop -p $PIDFILE --signal 3 --exec $DAEMON
+    /bin/sleep 5s
+    /bin/rm -f $SOCKET
+    /bin/rm -f $PIDFILE
+}
+
 case "$1" in
   start)
 	echo -n "Starting $DESC: "
-
-	start-stop-daemon --start -p $PIDFILE --exec $DAEMON -- -P $PIDFILE -f -p $SOCKET $OPTIONS
-
-	echo "${DAEMON}"
+	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}"
 
 	;;
   *)