summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Sackman <matthew@lshift.net>2009-11-18 16:16:19 +0000
committerMatthew Sackman <matthew@lshift.net>2009-11-18 16:16:19 +0000
commit858565a2401ae6df1d31cbd22c35281c25efe2ce (patch)
treed9aca693feb2c8caa44bd689a123e19101521114
parentf861a8286e852758896fd75fc7916c1d295c5abf (diff)
parent55290f3b8b1ae46a4f8dacf2db458dd1fd98c7b8 (diff)
downloadrabbitmq-server-858565a2401ae6df1d31cbd22c35281c25efe2ce.tar.gz
merged default heads
-rw-r--r--packaging/common/rabbitmq-server.init2
-rw-r--r--packaging/debs/Debian/debian/postrm.in (renamed from packaging/debs/Debian/debian/postrm)8
-rw-r--r--packaging/debs/Debian/debian/rules1
3 files changed, 9 insertions, 2 deletions
diff --git a/packaging/common/rabbitmq-server.init b/packaging/common/rabbitmq-server.init
index dc305975..39d23983 100644
--- a/packaging/common/rabbitmq-server.init
+++ b/packaging/common/rabbitmq-server.init
@@ -66,8 +66,6 @@ stop_rabbitmq () {
$DAEMON stop_all > ${INIT_LOG_DIR}/shutdown_log 2> ${INIT_LOG_DIR}/shutdown_err
RETVAL=$?
if [ $RETVAL = 0 ] ; then
- # Try to stop epmd if run by the rabbitmq user
- pkill -u rabbitmq epmd || :
[ -n "$LOCK_FILE" ] && rm -rf $LOCK_FILE
else
echo FAILED - check ${INIT_LOG_DIR}/shutdown_log, _err
diff --git a/packaging/debs/Debian/debian/postrm b/packaging/debs/Debian/debian/postrm.in
index a999d95b..bfcf1f53 100644
--- a/packaging/debs/Debian/debian/postrm
+++ b/packaging/debs/Debian/debian/postrm.in
@@ -34,7 +34,15 @@ case "$1" in
if [ -d /etc/rabbitmq ]; then
rm -r /etc/rabbitmq
fi
+ # Remove traces of plugins
+ rm -rf @RABBIT_LIB@/priv @RABBIT_LIB@/plugins
+ for ext in rel script boot ; do
+ rm -f @RABBIT_LIB@/ebin/rabbit.$ext
+ done
if getent passwd rabbitmq >/dev/null; then
+ # Stop epmd if run by the rabbitmq user
+ pkill -u rabbitmq epmd || :
+
deluser rabbitmq
fi
if getent group rabbitmq >/dev/null; then
diff --git a/packaging/debs/Debian/debian/rules b/packaging/debs/Debian/debian/rules
index 5e357955..3799c438 100644
--- a/packaging/debs/Debian/debian/rules
+++ b/packaging/debs/Debian/debian/rules
@@ -20,3 +20,4 @@ install/rabbitmq-server::
for script in rabbitmq-activate-plugins rabbitmq-deactivate-plugins; do \
install -p -D -m 0755 debian/rabbitmq-asroot-script-wrapper $(DEB_DESTDIR)usr/sbin/$$script; \
done
+ sed -e 's|@RABBIT_LIB@|/usr/lib/rabbitmq/lib/rabbitmq_server-$(DEB_UPSTREAM_VERSION)|g' <debian/postrm.in >debian/postrm