diff options
| author | David Wragg <dpw@lshift.net> | 2009-11-05 14:39:49 +0000 |
|---|---|---|
| committer | David Wragg <dpw@lshift.net> | 2009-11-05 14:39:49 +0000 |
| commit | 0ca1c4e5f2d2b2ba9dffd92986ef916bdec28d62 (patch) | |
| tree | 965ace8810a484bcf68a887ee999e68e46f56dd5 | |
| parent | 9659d0fe5b97434cda4f55aae54d62de56a9a340 (diff) | |
| download | rabbitmq-server-0ca1c4e5f2d2b2ba9dffd92986ef916bdec28d62.tar.gz | |
Move epmd killing from the init script to the Debian postrm script
| -rw-r--r-- | packaging/common/rabbitmq-server.init | 2 | ||||
| -rw-r--r-- | packaging/debs/Debian/debian/postrm | 4 |
2 files changed, 4 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 index a999d95b..5372ca85 100644 --- a/packaging/debs/Debian/debian/postrm +++ b/packaging/debs/Debian/debian/postrm @@ -34,6 +34,10 @@ case "$1" in if [ -d /etc/rabbitmq ]; then rm -r /etc/rabbitmq fi + + # Stop epmd if run by the rabbitmq user + pkill -u rabbitmq epmd || : + if getent passwd rabbitmq >/dev/null; then deluser rabbitmq fi |