From fc8aa90ebfc182e7e048e7bbb28f05b881266dad Mon Sep 17 00:00:00 2001 From: don Date: Mon, 29 Jan 2007 01:42:59 +0000 Subject: [PATCH] flip order of piddir and socketdir creation --- debian/spamass-milter.init | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) 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."; -- 2.39.2