flip order of piddir and socketdir creation

[deb_pkgs/spamass-milter.git] / debian / spamass-milter.init

diff --git a/debian/spamass-milter.init b/debian/spamass-milter.init
index d3d5cb989e984f026e4a5f0c94ca2a6b08436d43..4855d4eec76efebbdaa4cee5541a802f05323523 100644 (file)
--- 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
@@ -59,7 +60,6 @@ fi;
 # 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,23 @@ 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);
        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;
     /bin/rm -f $SOCKET
     start-stop-daemon --start -p $PIDFILE $CHUID --exec $DAEMON -- -P $PIDFILE -f -p $SOCKET $OPTIONS
@@ -108,19 +114,19 @@ 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}"
 
        ;;
   *)