X-Git-Url: https://git.donarmstrong.com/?p=deb_pkgs%2Fspamass-milter.git;a=blobdiff_plain;f=debian%2Fspamass-milter.init;h=1d7337afa2273ae4953c9e15989e9ee27d6a2498;hp=98647d9cfafb2bdff0788f406a6c1f2b0ae4413a;hb=1f97efb358a73d5dd47aeb8f86a96a40d6c32538;hpb=4d4e8dafb5646d8781dbf5fcdf695e8ca92227d1

diff --git a/debian/spamass-milter.init b/debian/spamass-milter.init
index 98647d9..1d7337a 100644
--- a/debian/spamass-milter.init
+++ b/debian/spamass-milter.init
@@ -33,50 +33,90 @@
 
 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="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/postfix ]; then
+    SOCKET="/var/spool/postfix/spamass/spamass.sock"
+    PIDFILE="/var/spool/postfix/spamass/spamass.pid"
+    SOCKETOWNER="postfix:postfix"
+fi;
+
 if [ -r $DEFAULT ]; then
     . $DEFAULT;
 fi;
 
+if [ -n "$RUNAS" ]; then
+    CHUID="--chuid $RUNAS";
+fi;
+
 set -e
 
+start() {
+    if [ ! -d $(dirname $SOCKET) ]; then
+	mkdir -p $(dirname $SOCKET);
+	if [ -n "$SOCKETOWNER" ]; then
+	    chown "$SOCKETOWNER" $(dirname $SOCKET);
+	fi;
+    fi;
+    if [ ! -d $(dirname $PIDFILE) ]; then
+	mkdir -p $(dirname $PIDFILE);
+	if [ -n "$RUNAS" ]; then
+	    chown "$RUNAS" $(dirname $PIDFILE);
+	fi;
+    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 -s $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
+    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
+}
+
 case "$1" in
   start)
 	echo -n "Starting $DESC: "
-
-	if [ ! -d $(basename $SOCKET) ]; then
-	    mkdir -p $(basename $SOCKET);
-	fi;
-	start-stop-daemon --start -p $PIDFILE --exec $DAEMON -- -P $PIDFILE -f -p $SOCKET $OPTIONS
-
+	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}"
 
 	;;
   *)