diff options
| author | Matthew Sackman <matthew@lshift.net> | 2009-11-18 16:16:19 +0000 |
|---|---|---|
| committer | Matthew Sackman <matthew@lshift.net> | 2009-11-18 16:16:19 +0000 |
| commit | bb9a90ddf33cf6bdcc2809cf3736a248d24f95a5 (patch) | |
| tree | d9aca693feb2c8caa44bd689a123e19101521114 | |
| parent | 4159a9a3afdc3fad8f5331c00321733ce398b7af (diff) | |
| parent | fbbcb18fd5cdd925b8f8c92b31f07d381d4bf056 (diff) | |
| download | rabbitmq-server-git-bb9a90ddf33cf6bdcc2809cf3736a248d24f95a5.tar.gz | |
merged default heads
| -rw-r--r-- | packaging/common/rabbitmq-server.init | 2 | ||||
| -rw-r--r-- | packaging/debs/Debian/debian/postrm.in (renamed from packaging/debs/Debian/debian/postrm) | 8 | ||||
| -rw-r--r-- | packaging/debs/Debian/debian/rules | 1 |
3 files changed, 9 insertions, 2 deletions
diff --git a/packaging/common/rabbitmq-server.init b/packaging/common/rabbitmq-server.init index dc30597569..39d239835c 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 a999d95b29..bfcf1f530e 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 5e3579557a..3799c4387a 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 |