From: don <don@8f7917da-ec0b-0410-a553-b9b0e350d17e>
Date: Mon, 29 Jan 2007 01:42:59 +0000 (+0000)
Subject: flip order of piddir and socketdir creation
X-Git-Tag: debian/0.4.0-1~62
X-Git-Url: https://git.donarmstrong.com/?p=deb_pkgs%2Fspamass-milter.git;a=commitdiff_plain;h=fc8aa90ebfc182e7e048e7bbb28f05b881266dad

flip order of piddir and socketdir creation
---

diff --git a/debian/spamass-milter.init b/debian/spamass-milter.init
index 6c519a9..4855d4e 100644
--- a/debian/spamass-milter.init
+++ b/debian/spamass-milter.init
@@ -75,18 +75,20 @@ 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 [ ! -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.";