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

diff --git a/debian/spamass-milter.init b/debian/spamass-milter.init
index d3d5cb9..c982b28 100644
--- a/debian/spamass-milter.init
+++ b/debian/spamass-milter.init
@@ -32,6 +32,7 @@
 
 
 PATH=/sbin:/bin:/usr/sbin:/usr/bin
+NAME=spamass-milter
 DAEMON=/usr/sbin/spamass-milter
 SOCKET=/var/run/spamass/spamass.sock
 PIDFILE=/var/run/spamass/spamass.pid
@@ -39,9 +40,9 @@ DESC="Sendmail milter plugin for SpamAssassin"
 
 DEFAULT=/etc/default/spamass-milter
 OPTIONS=""
-RUNAS="nobody"
+RUNAS="spamass-milter"
 CHUID=""
-SOCKETMODE="0640"
+SOCKETMODE="0600"
 SOCKETOWNER="root:root"
 
 test -x $DAEMON || exit 0
@@ -52,14 +53,13 @@ if [ -e /etc/mail/sendmail.cf ] && egrep -q 'X.+S=local:/var/run/sendmail/spamas
     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";
+    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"
-    PIDFILE="/var/spool/postfix/spamass/spamass.pid"
     SOCKETOWNER="postfix:postfix"
     SOCKETMODE="0660"
 fi;
@@ -75,17 +75,27 @@ 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 "$SOCKETOWNER" $(dirname $SOCKET);
+	    chown "$RUNAS" $(dirname $SOCKET);
 	fi;
     fi;
-    if [ ! -d $(dirname $PIDFILE) ]; then
-	mkdir -p $(dirname $PIDFILE);
-	if [ -n "$RUNAS" ]; then
-	    chown "$RUNAS" $(dirname $PIDFILE);
-	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
@@ -102,25 +112,26 @@ 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
-	echo "${DAEMON}"
+	echo "${NAME}"
 	;;
   stop)
 	echo -n "Stopping $DESC: "
 	stop
-	echo "${DAEMON}"
+	echo "${NAME}"
 	;;
   force-reload | restart)
 	echo -n "Restarting $DESC: "
 
 	stop
 	start
-	echo "${DAEMON}"
+	echo "${NAME}"
 
 	;;
   *)