flip order of piddir and socketdir creation

diff --git a/debian/spamass-milter.init b/debian/spamass-milter.init
index 6c519a9b6f98e3a07b1e95458d19dce73767d362..4855d4eec76efebbdaa4cee5541a802f05323523 100644 (file)
--- a/debian/spamass-milter.init
+++ b/debian/spamass-milter.init
@@ -75,18 +75,20 @@ fi;
 set -e
 
 start() {
 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 [ ! -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 [ -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 [ -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.";