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 00904f419445bc01f6794e4d4080e36d33479835..4855d4eec76efebbdaa4cee5541a802f05323523 100644 (file)
--- a/debian/spamass-milter.init
+++ b/debian/spamass-milter.init
@@ -75,21 +75,23 @@ fi;
 set -e
 
 start() {
-    if [ ! -d $(dirname $SOCKET) ]; then
-       mkdir -p $(dirname $SOCKET);
-       if [ -n "$SOCKETOWNER" ]; then
-           chown "$SOCKETOWNER" $(dirname $SOCKET);
-       fi;
-    fi;
+    # 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 [ -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."
+    if [ ! -d $(dirname $SOCKET) ]; then
+       mkdir -p $(dirname $SOCKET);
+       if [ -n "$SOCKETOWNER" ]; then
+           chown "$SOCKETOWNER" $(dirname $SOCKET);
+       fi;
+    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