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

diff --git a/debian/spamass-milter.init b/debian/spamass-milter.init
index 5396f64..4855d4e 100644
--- a/debian/spamass-milter.init
+++ b/debian/spamass-milter.init
@@ -32,24 +32,36 @@
 
 
 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="nobody"
 CHUID=""
+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/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"
+    SOCKETMODE="0660"
 fi;
 
 if [ -r $DEFAULT ]; then
@@ -62,44 +74,59 @@ 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() {
+    # 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;
-	if [ ! -d $(dirname $PIDFILE) ]; then
-	    mkdir -p $(dirname $PIDFILE);
-	    if [ -n "$RUNAS" ]; then
-		chown "$RUNAS" $(dirname $PIDFILE);
-	    fi;
+    fi;
+    if [ ! -d $(dirname $SOCKET) ]; then
+	mkdir -p $(dirname $SOCKET);
+	if [ -n "$SOCKETOWNER" ]; then
+	    chown "$SOCKETOWNER" $(dirname $SOCKET);
 	fi;
-	start-stop-daemon --start -p $PIDFILE $CHUID --exec $DAEMON -- -P $PIDFILE -f -p $SOCKET $OPTIONS
+    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;
+    /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
+}
 
-	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}"
 
 	;;
   *)