When we stop, wipe out the directory rather than just the pid file. This avoids having to worry about how to remove the directory on package uninstall and also has the advantage of helping non-rabbit-packaged distributions

Author: Matthew Sackman

packaging/common/rabbitmq-server.init

@@ -80,7 +80,7 @@ stop_rabbitmq () {
         RETVAL=$?
         set -e
         if [ $RETVAL = 0 ] ; then
-            rm -f $PID_FILE
+            rm -rf `dirname $PID_FILE`
             if [ -n "$LOCK_FILE" ] ; then
                 rm -f $LOCK_FILE
             fi

packaging/common/rabbitmq-server.ocf

@@ -309,7 +309,7 @@ rabbit_stop() {
         rabbit_status
         rc=$?
         if [ "$rc" = $OCF_NOT_RUNNING ]; then
-            rm -f $RABBITMQ_PID_FILE
+            rm -rf `dirname ${RABBITMQ_PID_FILE}`
             stop_wait=0
             break
         elif [ "$rc" != $OCF_SUCCESS ]; then