X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=debian%2Fspamass-milter.init;h=7d114aa4272225725a51c86f6c6b64cabea39d0e;hb=HEAD;hp=907f97fdd9423759b3f82943143f4a5f7730ca6d;hpb=c7266fb65a48efe8db3985dea9271ee94b3cd69b;p=deb_pkgs%2Fspamass-milter.git

diff --git a/debian/spamass-milter.init b/debian/spamass-milter.init
index 907f97f..7d114aa 100644
--- a/debian/spamass-milter.init
+++ b/debian/spamass-milter.init
@@ -36,8 +36,8 @@
 
 ### BEGIN INIT INFO
 # Provides:          spamass-milter
-# Required-Start:    $syslog $local_fs
-# Required-Stop:     $syslog $local_fs
+# Required-Start:    $syslog $local_fs $remote_fs
+# Required-Stop:     $syslog $local_fs $remote_fs
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
 # Short-Description: milter for spamassassin
@@ -90,22 +90,25 @@ fi;
 set -e
 
 start() {
+    if [ -e $PIDFILE ] && kill -0 $(cat $PIDFILE); then
+        echo "$NAME is already running";
+        exit 1;
+    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;
+    for DIR in "$(dirname $PIDFILE)" "$(dirname $SOCKET)"; do 
     # if the dirname is '.', then it's some kind of odd socket, like
     # an inet socket. Don't create the directory in such a case
-    if [ $(dirname $SOCKET) != "." ] && [ ! -d $(dirname $SOCKET) ]; then
-	mkdir -p $(dirname $SOCKET);
-	if [ -n "$SOCKETOWNER" ]; then
-	    chown "$RUNAS" $(dirname $SOCKET);
+	if [ "$DIR" != "." ] && [ ! -d "$DIR" ]; then
+	    mkdir -p "$DIR";
+	    if [ -x /sbin/restorecon ]; then 
+		/sbin/restorecon "$DIR";
+	    fi;
+	    if [ -n "$RUNAS" ]; then
+		chown "$RUNAS" "$DIR";
+	    fi;
 	fi;
-    fi;
+    done;
     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";
@@ -121,34 +124,38 @@ start() {
 	/bin/rm -f $SOCKET
     fi;
     start-stop-daemon --start -p $PIDFILE $CHUID --exec $DAEMON -- -P $PIDFILE -f -p $SOCKET $OPTIONS
-    sleep 1s
-    if [ -n "$SOCKETMODE" ]; then
-	chmod $SOCKETMODE $SOCKET;
-    fi;
-    if [ -n "$SOCKETOWNER" ]; then
-	chown $SOCKETOWNER $SOCKET;
+    sleep 1
+    if [ $(dirname $SOCKET) != "." ]; then
+       if [ -n "$SOCKETMODE" ]; then
+	       chmod $SOCKETMODE $SOCKET;
+       fi;
+       if [ -n "$SOCKETOWNER" ]; then
+	       chown $SOCKETOWNER $SOCKET;
+       fi;
     fi;
 }
 
 stop(){
     start-stop-daemon --oknodo --stop -p $PIDFILE --signal 3 --exec $DAEMON
-    /bin/sleep 5s
-    /bin/rm -f $SOCKET
+    /bin/sleep 5
+    if [ $(dirname $SOCKET) != "." ]; then 
+	    /bin/rm -f $SOCKET
+    fi;
     /bin/rm -f $PIDFILE
 }
 
 status(){
     if [ -e $PIDFILE ]; then 
-	if kill -0 $(cat $PIDFILE); then
-	    echo "${NAME} running";
-	    exit 0;
-	else
-	    echo "${NAME} dead but $PIDFILE exists";
-	    exit 1;
+	    if kill -0 $(cat $PIDFILE); then
+	        echo "${NAME} running";
+	        exit 0;
+	    else
+	        echo "${NAME} dead but $PIDFILE exists";
+	        exit 1;
+	    fi;
 	fi;
-	echo "${NAME} not running";
+    echo "${NAME} not running";
 	exit 3;
-    fi;
 }
 
 case "$1" in