X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=debian%2Fspamass-milter.init;h=d3d5cb989e984f026e4a5f0c94ca2a6b08436d43;hb=711b772efab941d300001ac04a86ca7ed3bfbcab;hp=79b38b1643fc682653e12227f630823e6086a784;hpb=600e9dd9b9304586e7cb4e51df941c84d71cfd71;p=deb_pkgs%2Fspamass-milter.git

diff --git a/debian/spamass-milter.init b/debian/spamass-milter.init
index 79b38b1..d3d5cb9 100644
--- a/debian/spamass-milter.init
+++ b/debian/spamass-milter.init
@@ -33,25 +33,35 @@
 
 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=""
+SOCKETMODE="0640"
+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 nobody";
+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=""
     PIDFILE="/var/spool/postfix/spamass/spamass.pid"
-    SOCKETMODE="0666"
+    SOCKETOWNER="postfix:postfix"
+    SOCKETMODE="0660"
 fi;
 
 if [ -r $DEFAULT ]; then
@@ -64,52 +74,53 @@ 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;
-	fi;
-	if [ ! -d $(dirname $PIDFILE) ]; then
-	    mkdir -p $(dirname $PIDFILE);
-	    if [ -n "$RUNAS" ]; then
-		chown "$RUNAS" $(dirname $PIDFILE);
-	    fi;
+start() {
+    if [ ! -d $(dirname $SOCKET) ]; then
+	mkdir -p $(dirname $SOCKET);
+	if [ -n "$SOCKETOWNER" ]; then
+	    chown "$SOCKETOWNER" $(dirname $SOCKET);
 	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 [ ! -d $(dirname $PIDFILE) ]; then
+	mkdir -p $(dirname $PIDFILE);
+	if [ -n "$RUNAS" ]; then
+	    chown "$RUNAS" $(dirname $PIDFILE);
 	fi;
+    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: "
+	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 $CHUID --exec $DAEMON -- -P $PIDFILE -f -p $SOCKET $OPTIONS
-
-	if [ -n "$SOCKETMODE" ]; then
-	    chmod $SOCKETMODE $SOCKET;
-	fi;
-
-        echo "${DAEMON}"
+	stop
+	start
+	echo "${DAEMON}"
 
 	;;
   *)