X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=debian%2Fspamass-milter.init;h=7993a972464f3b337977e47754960b3fb3b49e36;hb=7582d597f83bc1e015c1717ca0e4b2300654b661;hp=5396f649e208fa3a2871d7c937369ed5d1dd10ab;hpb=dede31818538268c78498b3b9ba53f39049b08be;p=deb_pkgs%2Fspamass-milter.git

diff --git a/debian/spamass-milter.init b/debian/spamass-milter.init
index 5396f64..7993a97 100644
--- a/debian/spamass-milter.init
+++ b/debian/spamass-milter.init
@@ -33,23 +33,25 @@
 
 PATH=/sbin:/bin:/usr/sbin:/usr/bin
 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="nobody"
 CHUID=""
+SOCKETMODE="0660"
+SOCKETOWNER="root:adm"
 
 test -x $DAEMON || exit 0
 
 # 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/posfix ]; then
+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"
 fi;
 
 if [ -r $DEFAULT ]; then
@@ -62,44 +64,58 @@ fi;
 
 set -e
 
-case "$1" in
-  start)
-	echo -n "Starting $DESC: "
-
-	if [ ! -d $(dirname $SOCKET) ]; then
-	    mkdir -p $(dirname $SOCKET);
-	    if [ -n "$RUNAS" ]; then
-		chown "$RUNAS" $(dirname $SOCKET);
-	    fi;
+start() {
+    if [ ! -d $(dirname $SOCKET) ]; then
+	mkdir -p $(dirname $SOCKET);
+	if [ -n "$SOCKETOWNER" ]; then
+	    chown "$SOCKETOWNER" $(dirname $SOCKET);
 	fi;
-	if [ ! -d $(dirname $PIDFILE) ]; then
-	    mkdir -p $(dirname $PIDFILE);
-	    if [ -n "$RUNAS" ]; then
-		chown "$RUNAS" $(dirname $PIDFILE);
-	    fi;
+    fi;
+    if [ ! -d $(dirname $PIDFILE) ]; then
+	mkdir -p $(dirname $PIDFILE);
+	if [ -n "$RUNAS" ]; then
+	    chown "$RUNAS" $(dirname $PIDFILE);
 	fi;
-	start-stop-daemon --start -p $PIDFILE $CHUID --exec $DAEMON -- -P $PIDFILE -f -p $SOCKET $OPTIONS
+    fi;
+    # Drop in a compatibility symlink for the old sendmail socket location
+    if [ -d /var/run/sendmail ] && [ -n "$RUNAS" ] && 
+	[ "$SOCKET" == "/var/run/spamass/spamass.sock" ] && 
+	! [ -e /var/run/sendmail/spamass.sock ]; then
+	ln $SOCKET /var/run/sendmail/spamass.sock;
+    fi;
+    /bin/rm -f $SOCKET
+    start-stop-daemon --start -p $PIDFILE $CHUID --exec $DAEMON -- -P $PIDFILE -f -p $SOCKET $OPTIONS
+    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
+}
 
+case "$1" in
+  start)
+	echo -n "Starting $DESC: "
+	start
 	echo "${DAEMON}"
 	;;
   stop)
 	echo -n "Stopping $DESC: "
-
-	start-stop-daemon --stop -p $PIDFILE --signal 3 --exec $DAEMON
-	/bin/sleep 5s
-	/bin/rm -f $SOCKET
-
+	stop
 	echo "${DAEMON}"
 	;;
   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 "${DAEMON}"
 
 	;;
   *)