merging in from default

6 files changed, 41 insertions, 19 deletions

diff --git a/packaging/common/rabbitmq-asroot-script-wrapper b/packaging/common/rabbitmq-asroot-script-wrapper
index 9ef59ad76b..ee5947b66c 100644
--- a/packaging/common/rabbitmq-asroot-script-wrapper
+++ b/packaging/common/rabbitmq-asroot-script-wrapper
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 ##   The contents of this file are subject to the Mozilla Public License
 ##   Version 1.1 (the "License"); you may not use this file except in
 ##   compliance with the License. You may obtain a copy of the License at
@@ -30,24 +30,16 @@
 ##   Contributor(s): ______________________________________.
 ##
 
-# Escape spaces and quotes, because shell is revolting.
-for arg in "$@" ; do
-	# Escape quotes in parameters, so that they're passed through cleanly.
-	arg=$(sed -e 's/"/\\"/g' <<-END
-		$arg
-		END
-	)
-	CMDLINE="${CMDLINE} \"${arg}\""
-done
-
 cd /var/lib/rabbitmq
 
 SCRIPT=`basename $0`
 
 if [ `id -u` = 0 ] ; then
-    /usr/lib/rabbitmq/bin/${SCRIPT} ${CMDLINE}
+    /usr/lib/rabbitmq/bin/${SCRIPT} "$@"
 else
-    echo -e "\nOnly root should run ${SCRIPT}\n"
+    echo
+    echo "Only root should run ${SCRIPT}"
+    echo
     exit 1
 fi
 
diff --git a/packaging/common/rabbitmq-script-wrapper b/packaging/common/rabbitmq-script-wrapper
index 08e888cd55..dfb714f16e 100644
--- a/packaging/common/rabbitmq-script-wrapper
+++ b/packaging/common/rabbitmq-script-wrapper
@@ -50,7 +50,9 @@ elif [ `id -u` = `id -u rabbitmq` ] ; then
     /usr/lib/rabbitmq/bin/${SCRIPT} "$@"
 else
     /usr/lib/rabbitmq/bin/${SCRIPT}
-    echo -e "\nOnly root or rabbitmq should run ${SCRIPT}\n"
+    echo
+    echo "Only root or rabbitmq should run ${SCRIPT}"
+    echo
     exit 1
 fi
 
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
diff --git a/scripts/rabbitmq-service.bat b/scripts/rabbitmq-service.bat
index 0cc7bfa915..26bdc1e6b0 100755
--- a/scripts/rabbitmq-service.bat
+++ b/scripts/rabbitmq-service.bat
@@ -158,11 +158,31 @@ if errorlevel 1 (
     echo %RABBITMQ_SERVICENAME% service is already present - only updating service parameters

 )

 

-set RABBIT_EBIN=%~dp0..\ebin

+set RABBITMQ_EBIN_ROOT=%~dp0..\ebin

+if exist "%RABBITMQ_EBIN_ROOT%\rabbit.boot" (

+    echo Using Custom Boot File "%RABBITMQ_EBIN_ROOT%\rabbit.boot"

+    set RABBITMQ_BOOT_FILE=%RABBITMQ_EBIN_ROOT%\rabbit

+    set RABBITMQ_EBIN_PATH=

+) else (

+    set RABBITMQ_BOOT_FILE=start_sasl

+    set RABBITMQ_EBIN_PATH=-pa "%RABBITMQ_EBIN_ROOT%"

+)

+if "%RABBITMQ_CONFIG_FILE%"=="" (

+    set RABBITMQ_CONFIG_FILE=%RABBITMQ_BASE%\rabbitmq

+)

+   

+if exist "%RABBITMQ_CONFIG_FILE%.config" (

+    set RABBITMQ_CONFIG_ARG=-config "%RABBITMQ_CONFIG_FILE%"

+) else (

+    set RABBITMQ_CONFIG_ARG=

+)

+

+

 

 set ERLANG_SERVICE_ARGUMENTS= ^

--pa "%RABBIT_EBIN%" ^

--boot start_sasl ^

+%RABBITMQ_EBIN_PATH% ^

+-boot "%RABBITMQ_BOOT_FILE%" ^

+%RABBITMQ_CONFIG_ARG% ^

 -s rabbit ^

 +W w ^

 +A30 ^

@@ -170,6 +190,7 @@ set ERLANG_SERVICE_ARGUMENTS= ^
 -kernel inet_default_connect_options "[{nodelay,true}]" ^

 -rabbit tcp_listeners "[{\"%RABBITMQ_NODE_IP_ADDRESS%\",%RABBITMQ_NODE_PORT%}]" ^

 -kernel error_logger {file,\""%RABBITMQ_LOG_BASE%/%RABBITMQ_NODENAME%.log"\"} ^

+%RABBITMQ_SERVER_ERL_ARGS% ^

 -sasl errlog_type error ^

 -sasl sasl_error_logger {file,\""%RABBITMQ_LOG_BASE%/%RABBITMQ_NODENAME%-sasl.log"\"} ^

 -os_mon start_cpu_sup true ^