merge from default

16 files changed, 731 insertions, 187 deletions

diff --git a/packaging/RPMS/Fedora/Makefile b/packaging/RPMS/Fedora/Makefile
index 74a1800adb..287945fe1b 100644
--- a/packaging/RPMS/Fedora/Makefile
+++ b/packaging/RPMS/Fedora/Makefile
@@ -31,7 +31,6 @@ prepare:
 
 	cp ${COMMON_DIR}/* SOURCES/
 	sed -i \
-	    -e 's|^DEFAULTS_FILE=.*$$|DEFAULTS_FILE=/etc/sysconfig/rabbitmq|' \
 	    -e 's|^LOCK_FILE=.*$$|LOCK_FILE=/var/lock/subsys/$$NAME|' \
 	    SOURCES/rabbitmq-server.init
 	sed -i -e 's|@SU_RABBITMQ_SH_C@|su rabbitmq -s /bin/sh -c|' \
diff --git a/packaging/RPMS/Fedora/rabbitmq-server.spec b/packaging/RPMS/Fedora/rabbitmq-server.spec
index b37f7ab1fa..009d52998e 100644
--- a/packaging/RPMS/Fedora/rabbitmq-server.spec
+++ b/packaging/RPMS/Fedora/rabbitmq-server.spec
@@ -55,7 +55,6 @@ mkdir -p %{buildroot}%{_localstatedir}/log/rabbitmq
 install -p -D -m 0755 %{S:1} %{buildroot}%{_initrddir}/rabbitmq-server
 install -p -D -m 0755 %{_rabbit_wrapper} %{buildroot}%{_sbindir}/rabbitmqctl
 install -p -D -m 0755 %{_rabbit_wrapper} %{buildroot}%{_sbindir}/rabbitmq-server
-install -p -D -m 0755 %{_rabbit_wrapper} %{buildroot}%{_sbindir}/rabbitmq-multi
 install -p -D -m 0755 %{_rabbit_server_ocf} %{buildroot}%{_exec_prefix}/lib/ocf/resource.d/rabbitmq/rabbitmq-server
 
 install -p -D -m 0644 %{S:3} %{buildroot}%{_sysconfdir}/logrotate.d/rabbitmq-server
@@ -92,6 +91,9 @@ fi
 
 %post
 /sbin/chkconfig --add %{name}
+if [ -f %{_sysconfdir}/rabbitmq/rabbitmq.conf ] && [ ! -f %{_sysconfdir}/rabbitmq/rabbitmq-env.conf ]; then
+    mv %{_sysconfdir}/rabbitmq/rabbitmq.conf %{_sysconfdir}/rabbitmq/rabbitmq-env.conf
+fi
 
 %preun
 if [ $1 = 0 ]; then
@@ -124,6 +126,12 @@ done
 rm -rf %{buildroot}
 
 %changelog
+* Thu Feb 3 2011 simon@rabbitmq.com 2.3.1-1
+- New Upstream Release
+
+* Tue Feb 1 2011 simon@rabbitmq.com 2.3.0-1
+- New Upstream Release
+
 * Mon Nov 29 2010 rob@rabbitmq.com 2.2.0-1
 - New Upstream Release
 
diff --git a/packaging/common/rabbitmq-script-wrapper b/packaging/common/rabbitmq-script-wrapper
index 79096a4e92..23d2a06cbd 100644
--- a/packaging/common/rabbitmq-script-wrapper
+++ b/packaging/common/rabbitmq-script-wrapper
@@ -1,33 +1,18 @@
 #!/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
-##   http://www.mozilla.org/MPL/
+##  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 http://www.mozilla.org/MPL/
 ##
-##   Software distributed under the License is distributed on an "AS IS"
-##   basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
-##   License for the specific language governing rights and limitations
-##   under the License.
+##  Software distributed under the License is distributed on an "AS IS"
+##  basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+##  the License for the specific language governing rights and
+##  limitations under the License.
 ##
-##   The Original Code is RabbitMQ.
+##  The Original Code is RabbitMQ.
 ##
-##   The Initial Developers of the Original Code are LShift Ltd,
-##   Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd.
-##
-##   Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd,
-##   Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd
-##   are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
-##   Technologies LLC, and Rabbit Technologies Ltd.
-##
-##   Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift
-##   Ltd. Portions created by Cohesive Financial Technologies LLC are
-##   Copyright (C) 2007-2010 Cohesive Financial Technologies
-##   LLC. Portions created by Rabbit Technologies Ltd are Copyright
-##   (C) 2007-2010 Rabbit Technologies Ltd.
-##
-##   All Rights Reserved.
-##
-##   Contributor(s): ______________________________________.
+##  The Initial Developer of the Original Code is VMware, Inc.
+##  Copyright (c) 2007-2011 VMware, Inc.  All rights reserved.
 ##
 
 # Escape spaces and quotes, because shell is revolting.
@@ -55,4 +40,3 @@ else
     echo
     exit 1
 fi
-
diff --git a/packaging/common/rabbitmq-server.init b/packaging/common/rabbitmq-server.init
index 39d239835c..c1647dc505 100644
--- a/packaging/common/rabbitmq-server.init
+++ b/packaging/common/rabbitmq-server.init
@@ -17,75 +17,77 @@
 ### END INIT INFO
 
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
-DAEMON=/usr/sbin/rabbitmq-multi
 NAME=rabbitmq-server
+DAEMON=/usr/sbin/${NAME}
+CONTROL=/usr/sbin/rabbitmqctl
 DESC=rabbitmq-server
 USER=rabbitmq
-NODE_COUNT=1
 ROTATE_SUFFIX=
 INIT_LOG_DIR=/var/log/rabbitmq
 
-DEFAULTS_FILE= # This is filled in when building packages
 LOCK_FILE= # This is filled in when building packages
 
 test -x $DAEMON || exit 0
 
-# Include rabbitmq defaults if available
-if [ -f "$DEFAULTS_FILE" ] ; then
-	. $DEFAULTS_FILE
-fi
-
 RETVAL=0
 set -e
 
 start_rabbitmq () {
-    set +e
-    $DAEMON start_all ${NODE_COUNT} > ${INIT_LOG_DIR}/startup_log 2> ${INIT_LOG_DIR}/startup_err
-    case "$?" in
-      0)
-        echo SUCCESS
-        [ -n "$LOCK_FILE" ] && touch $LOCK_FILE
+    status_rabbitmq quiet
+    if [ $RETVAL = 0 ] ; then
+        echo RabbitMQ is currently running
+    else
         RETVAL=0
-        ;;
-      1)
-        echo TIMEOUT - check ${INIT_LOG_DIR}/startup_\{log,err\}
-        RETVAL=1
-        ;;
-      *)
-        echo FAILED - check ${INIT_LOG_DIR}/startup_log, _err
-        RETVAL=1
-        ;;
-    esac
-    set -e
+        set +e
+        setsid sh -c "$DAEMON > ${INIT_LOG_DIR}/startup_log \
+            2> ${INIT_LOG_DIR}/startup_err" &
+        $CONTROL wait >/dev/null 2>&1
+        RETVAL=$?
+        set -e
+        case "$RETVAL" in
+            0)
+                echo SUCCESS
+                if [ -n "$LOCK_FILE" ] ; then
+                    touch $LOCK_FILE
+                fi
+                ;;
+            *)
+                echo FAILED - check ${INIT_LOG_DIR}/startup_\{log, _err\}
+                RETVAL=1
+                ;;
+        esac
+    fi
 }
 
 stop_rabbitmq () {
-    set +e
     status_rabbitmq quiet
     if [ $RETVAL = 0 ] ; then
-        $DAEMON stop_all > ${INIT_LOG_DIR}/shutdown_log 2> ${INIT_LOG_DIR}/shutdown_err
+        set +e
+        $CONTROL stop > ${INIT_LOG_DIR}/shutdown_log 2> ${INIT_LOG_DIR}/shutdown_err
         RETVAL=$?
+        set -e
         if [ $RETVAL = 0 ] ; then
-            [ -n "$LOCK_FILE" ] && rm -rf $LOCK_FILE
+            if [ -n "$LOCK_FILE" ] ; then
+                rm -f $LOCK_FILE
+            fi
         else
             echo FAILED - check ${INIT_LOG_DIR}/shutdown_log, _err
         fi
     else
-        echo No nodes running 
+        echo RabbitMQ is not running
         RETVAL=0
     fi
-    set -e
 }
 
 status_rabbitmq() {
     set +e
     if [ "$1" != "quiet" ] ; then
-        $DAEMON status 2>&1
+        $CONTROL status 2>&1
     else
-        $DAEMON status > /dev/null 2>&1
+        $CONTROL status > /dev/null 2>&1
     fi
     if [ $? != 0 ] ; then
-        RETVAL=1
+        RETVAL=3
     fi
     set -e
 }
@@ -100,7 +102,7 @@ rotate_logs_rabbitmq() {
 }
 
 restart_rabbitmq() {
-    stop_rabbitmq	    
+    stop_rabbitmq
     start_rabbitmq
 }
 
diff --git a/packaging/common/rabbitmq-server.ocf b/packaging/common/rabbitmq-server.ocf
index b969535aba..94999d0edf 100755
--- a/packaging/common/rabbitmq-server.ocf
+++ b/packaging/common/rabbitmq-server.ocf
@@ -1,41 +1,26 @@
 #!/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 http://www.mozilla.org/MPL/
 ##
-##   OCF Resource Agent compliant rabbitmq-server resource script.
-##
-
-##   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
-##   http://www.mozilla.org/MPL/
-##
-##   Software distributed under the License is distributed on an "AS IS"
-##   basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
-##   License for the specific language governing rights and limitations
-##   under the License.
+##  Software distributed under the License is distributed on an "AS IS"
+##  basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+##  the License for the specific language governing rights and
+##  limitations under the License.
 ##
-##   The Original Code is RabbitMQ.
+##  The Original Code is RabbitMQ.
 ##
-##   The Initial Developers of the Original Code are LShift Ltd,
-##   Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd.
+##  The Initial Developer of the Original Code is VMware, Inc.
+##  Copyright (c) 2007-2011 VMware, Inc.  All rights reserved.
 ##
-##   Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd,
-##   Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd
-##   are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
-##   Technologies LLC, and Rabbit Technologies Ltd.
-##
-##   Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift
-##   Ltd. Portions created by Cohesive Financial Technologies LLC are
-##   Copyright (C) 2007-2010 Cohesive Financial Technologies
-##   LLC. Portions created by Rabbit Technologies Ltd are Copyright
-##   (C) 2007-2010 Rabbit Technologies Ltd.
-##
-##   All Rights Reserved.
+
 ##
-##   Contributor(s): ______________________________________.
+##   OCF Resource Agent compliant rabbitmq-server resource script.
 ##
 
 ## OCF instance parameters
-##   OCF_RESKEY_multi
+##   OCF_RESKEY_server
 ##   OCF_RESKEY_ctl
 ##   OCF_RESKEY_nodename
 ##   OCF_RESKEY_ip
@@ -53,11 +38,11 @@
 
 #######################################################################
 
-OCF_RESKEY_multi_default="/usr/sbin/rabbitmq-multi"
+OCF_RESKEY_server_default="/usr/sbin/rabbitmq-server"
 OCF_RESKEY_ctl_default="/usr/sbin/rabbitmqctl"
 OCF_RESKEY_nodename_default="rabbit@localhost"
 OCF_RESKEY_log_base_default="/var/log/rabbitmq"
-: ${OCF_RESKEY_multi=${OCF_RESKEY_multi_default}}
+: ${OCF_RESKEY_server=${OCF_RESKEY_server_default}}
 : ${OCF_RESKEY_ctl=${OCF_RESKEY_ctl_default}}
 : ${OCF_RESKEY_nodename=${OCF_RESKEY_nodename_default}}
 : ${OCF_RESKEY_log_base=${OCF_RESKEY_log_base_default}}
@@ -76,12 +61,12 @@ Resource agent for RabbitMQ-server
 <shortdesc lang="en">Resource agent for RabbitMQ-server</shortdesc>
 
 <parameters>
-<parameter name="multi" unique="0" required="0">
+<parameter name="server" unique="0" required="0">
 <longdesc lang="en">
-The path to the rabbitmq-multi script
+The path to the rabbitmq-server script
 </longdesc>
-<shortdesc lang="en">Path to rabbitmq-multi</shortdesc>
-<content type="string" default="${OCF_RESKEY_multi_default}" />
+<shortdesc lang="en">Path to rabbitmq-server</shortdesc>
+<content type="string" default="${OCF_RESKEY_server_default}" />
 </parameter>
 
 <parameter name="ctl" unique="0" required="0">
@@ -170,7 +155,7 @@ Expects to have a fully populated OCF RA-compliant environment set.
 END
 }
 
-RABBITMQ_MULTI=$OCF_RESKEY_multi
+RABBITMQ_SERVER=$OCF_RESKEY_server
 RABBITMQ_CTL=$OCF_RESKEY_ctl
 RABBITMQ_NODENAME=$OCF_RESKEY_nodename
 RABBITMQ_NODE_IP_ADDRESS=$OCF_RESKEY_ip
@@ -192,8 +177,8 @@ export_vars() {
 }
 
 rabbit_validate_partial() {
-    if [ ! -x $RABBITMQ_MULTI ]; then
-        ocf_log err "rabbitmq-server multi $RABBITMQ_MULTI does not exist or is not executable";
+    if [ ! -x $RABBITMQ_SERVER ]; then
+        ocf_log err "rabbitmq-server server $RABBITMQ_SERVER does not exist or is not executable";
         exit $OCF_ERR_INSTALLED;
     fi
 
@@ -225,8 +210,18 @@ rabbit_validate_full() {
 }
 
 rabbit_status() {
+    rabbitmqctl_action "status"
+}
+
+rabbit_wait() {
+    rabbitmqctl_action "wait"
+}
+
+rabbitmqctl_action() {
     local rc
-    $RABBITMQ_CTL $NODENAME_ARG status > /dev/null 2> /dev/null
+    local action
+    action=$1
+    $RABBITMQ_CTL $NODENAME_ARG $action > /dev/null 2> /dev/null
     rc=$?
     case "$rc" in
         0)
@@ -238,7 +233,7 @@ rabbit_status() {
             return $OCF_NOT_RUNNING
             ;;
         *)
-            ocf_log err "Unexpected return from rabbitmqctl $NODENAME_ARG status: $rc"
+            ocf_log err "Unexpected return from rabbitmqctl $NODENAME_ARG $action: $rc"
             exit $OCF_ERR_GENERIC
     esac
 }
@@ -253,28 +248,16 @@ rabbit_start() {
 
     export_vars
 
-    $RABBITMQ_MULTI start_all 1 > ${RABBITMQ_LOG_BASE}/startup_log 2> ${RABBITMQ_LOG_BASE}/startup_err &
-    rc=$?
+    setsid sh -c "$RABBITMQ_SERVER > ${RABBITMQ_LOG_BASE}/startup_log 2> ${RABBITMQ_LOG_BASE}/startup_err" &
 
-    if [ "$rc" != 0 ]; then
-        ocf_log err "rabbitmq-server start command failed: $RABBITMQ_MULTI start_all 1, $rc"
-        return $rc
-    fi
-
-    # Spin waiting for the server to come up.
+    # Wait for the server to come up.
     # Let the CRM/LRM time us out if required
-    start_wait=1
-    while [ $start_wait = 1 ]; do
-        rabbit_status
-        rc=$?
-        if [ "$rc" = $OCF_SUCCESS ]; then
-            start_wait=0
-        elif [ "$rc" != $OCF_NOT_RUNNING ]; then
-            ocf_log info "rabbitmq-server start failed: $rc"
-            exit $OCF_ERR_GENERIC
-        fi
-        sleep 1
-    done
+    rabbit_wait
+    rc=$?
+    if [ "$rc" != $OCF_SUCCESS ]; then
+        ocf_log info "rabbitmq-server start failed: $rc"
+        exit $OCF_ERR_GENERIC
+    fi
 
     return $OCF_SUCCESS
 }
@@ -287,11 +270,11 @@ rabbit_stop() {
         return $OCF_SUCCESS
     fi
 
-    $RABBITMQ_MULTI stop_all &
+    $RABBITMQ_CTL stop
     rc=$?
 
     if [ "$rc" != 0 ]; then
-        ocf_log err "rabbitmq-server stop command failed: $RABBITMQ_MULTI stop_all, $rc"
+        ocf_log err "rabbitmq-server stop command failed: $RABBITMQ_CTL stop, $rc"
         return $rc
     fi
 
diff --git a/packaging/debs/Debian/Makefile b/packaging/debs/Debian/Makefile
index ab05f73225..d937fbb2eb 100644
--- a/packaging/debs/Debian/Makefile
+++ b/packaging/debs/Debian/Makefile
@@ -23,7 +23,6 @@ package: clean
 	cp -r debian $(UNPACKED_DIR)
 	cp $(COMMON_DIR)/* $(UNPACKED_DIR)/debian/
 	sed -i \
-	    -e 's|^DEFAULTS_FILE=.*$$|DEFAULTS_FILE=/etc/default/rabbitmq|' \
 	    -e 's|^LOCK_FILE=.*$$|LOCK_FILE=|' \
 	    $(UNPACKED_DIR)/debian/rabbitmq-server.init
 	sed -i -e 's|@SU_RABBITMQ_SH_C@|su rabbitmq -s /bin/sh -c|' \
diff --git a/packaging/debs/Debian/debian/changelog b/packaging/debs/Debian/debian/changelog
index a60e691d15..12165dc0ac 100644
--- a/packaging/debs/Debian/debian/changelog
+++ b/packaging/debs/Debian/debian/changelog
@@ -1,3 +1,15 @@
+rabbitmq-server (2.3.1-1) lucid; urgency=low
+
+  * New Upstream Release
+
+ -- Simon MacMullen <simon@rabbitmq.com>  Thu, 03 Feb 2011 12:43:56 +0000
+
+rabbitmq-server (2.3.0-1) lucid; urgency=low
+
+  * New Upstream Release
+
+ -- Simon MacMullen <simon@rabbitmq.com>  Tue, 01 Feb 2011 12:52:16 +0000
+
 rabbitmq-server (2.2.0-1) lucid; urgency=low
 
   * New Upstream Release
diff --git a/packaging/debs/Debian/debian/copyright b/packaging/debs/Debian/debian/copyright
index a569f31aaa..7206bb9b93 100755
--- a/packaging/debs/Debian/debian/copyright
+++ b/packaging/debs/Debian/debian/copyright
@@ -3,23 +3,23 @@ Wed,  3 Jan 2007 15:43:44 +0000.
 
 It was downloaded from http://www.rabbitmq.com/
 
-The file codegen/amqp-0.8.json is covered by the following terms:
+The files codegen/amqp-rabbitmq-0.8.json and
+codegen/amqp-rabbitmq-0.9.1.json are covered by the following terms:
+
+        "Copyright (C) 2008-2011 VMware, Inc.
 
-        "Copyright (C) 2008-2010 LShift Ltd, Cohesive Financial Technologies LLC,
-        and Rabbit Technologies Ltd
-        
         Permission is hereby granted, free of charge, to any person
         obtaining a copy of this file (the Software), to deal in the
-        Software without restriction, including without limitation the 
-        rights to use, copy, modify, merge, publish, distribute, 
-        sublicense, and/or sell copies of the Software, and to permit 
-        persons to whom the Software is furnished to do so, subject to 
+        Software without restriction, including without limitation the
+        rights to use, copy, modify, merge, publish, distribute,
+        sublicense, and/or sell copies of the Software, and to permit
+        persons to whom the Software is furnished to do so, subject to
         the following conditions:
-	
-	The above copyright notice and this permission notice shall be
+
+        The above copyright notice and this permission notice shall be
         included in all copies or substantial portions of the Software.
-	
-	THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+
+        THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
         EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
         OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
         NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
@@ -31,19 +31,8 @@ The file codegen/amqp-0.8.json is covered by the following terms:
 The rest of this package is licensed under the Mozilla Public License 1.1
 Authors and Copyright are as described below:
 
-     The Initial Developers of the Original Code are LShift Ltd,
-     Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd.
-
-     Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd,
-     Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd
-     are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
-     Technologies LLC, and Rabbit Technologies Ltd.
-
-     Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift
-     Ltd. Portions created by Cohesive Financial Technologies LLC are
-     Copyright (C) 2007-2010 Cohesive Financial Technologies
-     LLC. Portions created by Rabbit Technologies Ltd are Copyright
-     (C) 2007-2010 Rabbit Technologies Ltd.
+     The Initial Developer of the Original Code is VMware, Inc.
+     Copyright (c) 2007-2011 VMware, Inc.  All rights reserved.
 
 
                           MOZILLA PUBLIC LICENSE
@@ -494,23 +483,8 @@ EXHIBIT A -Mozilla Public License.
 
      The Original Code is RabbitMQ.
 
-     The Initial Developers of the Original Code are LShift Ltd,
-     Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd.
-
-     Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd,
-     Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd
-     are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
-     Technologies LLC, and Rabbit Technologies Ltd.
-
-     Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift
-     Ltd. Portions created by Cohesive Financial Technologies LLC are
-     Copyright (C) 2007-2010 Cohesive Financial Technologies
-     LLC. Portions created by Rabbit Technologies Ltd are Copyright
-     (C) 2007-2010 Rabbit Technologies Ltd.
-
-     All Rights Reserved.
-
-     Contributor(s): ______________________________________.''
+     The Initial Developer of the Original Code is VMware, Inc.
+     Copyright (c) 2007-2011 VMware, Inc.  All rights reserved.''
 
      [NOTE: The text of this Exhibit A may differ slightly from the text of
      the notices in the Source Code files of the Original Code. You should
@@ -521,10 +495,8 @@ EXHIBIT A -Mozilla Public License.
 
 
 
-If you have any questions regarding licensing, please contact us at 
+If you have any questions regarding licensing, please contact us at
 info@rabbitmq.com.
 
-The Debian packaging is (C) 2007-2010, Rabbit Technologies Ltd. <info@rabbitmq.com>
-and is licensed under the MPL 1.1, see above.
-
-
+The Debian packaging is (C) 2007-2011, VMware, Inc. and is licensed
+under the MPL 1.1, see above.
diff --git a/packaging/debs/Debian/debian/postinst b/packaging/debs/Debian/debian/postinst
index 05fb179cbf..b11340ef8a 100644
--- a/packaging/debs/Debian/debian/postinst
+++ b/packaging/debs/Debian/debian/postinst
@@ -26,7 +26,8 @@ fi
 # create rabbitmq user
 if ! getent passwd rabbitmq >/dev/null; then
         adduser --system --ingroup rabbitmq --home /var/lib/rabbitmq \
-        	--no-create-home --gecos "RabbitMQ messaging server" rabbitmq
+                --no-create-home --gecos "RabbitMQ messaging server" \
+                --disabled-login rabbitmq
 fi
 
 chown -R rabbitmq:rabbitmq /var/lib/rabbitmq
@@ -34,6 +35,10 @@ chown -R rabbitmq:rabbitmq /var/log/rabbitmq
 
 case "$1" in
     configure)
+        if [ -f /etc/rabbitmq/rabbitmq.conf ] && \
+           [ ! -f /etc/rabbitmq/rabbitmq-env.conf ]; then
+            mv /etc/rabbitmq/rabbitmq.conf /etc/rabbitmq/rabbitmq-env.conf
+        fi
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)
diff --git a/packaging/debs/Debian/debian/rules b/packaging/debs/Debian/debian/rules
index 6b6df33b09..a785b292af 100644
--- a/packaging/debs/Debian/debian/rules
+++ b/packaging/debs/Debian/debian/rules
@@ -14,7 +14,7 @@ DOCDIR=$(DEB_DESTDIR)usr/share/doc/rabbitmq-server/
 install/rabbitmq-server::
 	mkdir -p $(DOCDIR)
 	rm $(RABBIT_LIB)LICENSE* $(RABBIT_LIB)INSTALL*
-	for script in rabbitmqctl rabbitmq-server rabbitmq-multi; do \
+	for script in rabbitmqctl rabbitmq-server; do \
 		install -p -D -m 0755 debian/rabbitmq-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/packaging/macports/Portfile.in b/packaging/macports/Portfile.in
index f8417b83b9..c69c4f94d4 100644
--- a/packaging/macports/Portfile.in
+++ b/packaging/macports/Portfile.in
@@ -81,31 +81,28 @@ post-destroot {
     xinstall -d -g [existsgroup ${servergroup}] -m 775 ${destroot}${serverhome}
     xinstall -d -g [existsgroup ${servergroup}] -m 775 ${destroot}${mnesiadbdir}
 
-    reinplace -E "s:(/etc/rabbitmq/rabbitmq.conf):${prefix}\\1:g" \
+    reinplace -E "s:(/etc/rabbitmq/rabbitmq):${prefix}\\1:g" \
         ${realsbin}/rabbitmq-env
-    foreach var {CONFIG_FILE LOG_BASE MNESIA_BASE PIDS_FILE} {
+    foreach var {CONFIG_FILE LOG_BASE MNESIA_BASE} {
         reinplace -E "s:^($var)=/:\\1=${prefix}/:" \
-            ${realsbin}/rabbitmq-multi \
             ${realsbin}/rabbitmq-server \
             ${realsbin}/rabbitmqctl
     }
 
     xinstall -m 555 ${filespath}/rabbitmq-script-wrapper \
-                ${wrappersbin}/rabbitmq-multi
+                ${wrappersbin}/rabbitmq-server
 
     reinplace -E "s:MACPORTS_PREFIX/bin:${prefix}/bin:" \
-                ${wrappersbin}/rabbitmq-multi
+                ${wrappersbin}/rabbitmq-server
     reinplace -E "s:/usr/lib/rabbitmq/bin/:${prefix}/lib/rabbitmq/bin/:" \
-                ${wrappersbin}/rabbitmq-multi
+                ${wrappersbin}/rabbitmq-server
     reinplace -E "s:/var/lib/rabbitmq:${prefix}/var/lib/rabbitmq:" \
-                ${wrappersbin}/rabbitmq-multi
-    file copy ${wrappersbin}/rabbitmq-multi ${wrappersbin}/rabbitmq-server
-    file copy ${wrappersbin}/rabbitmq-multi ${wrappersbin}/rabbitmqctl
+                ${wrappersbin}/rabbitmq-server
+    file copy ${wrappersbin}/rabbitmq-server ${wrappersbin}/rabbitmqctl
 
-    file copy ${mansrc}/man1/rabbitmq-multi.1.gz  ${mandest}/man1/
     file copy ${mansrc}/man1/rabbitmq-server.1.gz ${mandest}/man1/
     file copy ${mansrc}/man1/rabbitmqctl.1.gz     ${mandest}/man1/
-    file copy ${mansrc}/man5/rabbitmq.conf.5.gz   ${mandest}/man5/
+    file copy ${mansrc}/man5/rabbitmq-env.conf.5.gz ${mandest}/man5/
 }
 
 pre-install {
diff --git a/packaging/windows-exe/Makefile b/packaging/windows-exe/Makefile
new file mode 100644
index 0000000000..59803f9ce9
--- /dev/null
+++ b/packaging/windows-exe/Makefile
@@ -0,0 +1,16 @@
+VERSION=0.0.0
+ZIP=../windows/rabbitmq-server-windows-$(VERSION)
+
+dist: rabbitmq-$(VERSION).nsi rabbitmq_server-$(VERSION)
+	makensis rabbitmq-$(VERSION).nsi
+
+rabbitmq-$(VERSION).nsi: rabbitmq_nsi.in
+	sed \
+	    -e 's|%%VERSION%%|$(VERSION)|' \
+	    $< > $@
+
+rabbitmq_server-$(VERSION):
+	unzip $(ZIP)
+
+clean:
+	rm -rf rabbitmq-*.nsi rabbitmq_server-* rabbitmq-server-*.exe
diff --git a/packaging/windows-exe/lib/EnvVarUpdate.nsh b/packaging/windows-exe/lib/EnvVarUpdate.nsh
new file mode 100644
index 0000000000..839d6a0206
--- /dev/null
+++ b/packaging/windows-exe/lib/EnvVarUpdate.nsh
@@ -0,0 +1,327 @@
+/**

+ *  EnvVarUpdate.nsh

+ *    : Environmental Variables: append, prepend, and remove entries

+ *

+ *     WARNING: If you use StrFunc.nsh header then include it before this file

+ *              with all required definitions. This is to avoid conflicts

+ *

+ *  Usage:

+ *    ${EnvVarUpdate} "ResultVar" "EnvVarName" "Action" "RegLoc" "PathString"

+ *

+ *  Credits:

+ *  Version 1.0 

+ *  * Cal Turney (turnec2)

+ *  * Amir Szekely (KiCHiK) and e-circ for developing the forerunners of this

+ *    function: AddToPath, un.RemoveFromPath, AddToEnvVar, un.RemoveFromEnvVar,

+ *    WriteEnvStr, and un.DeleteEnvStr

+ *  * Diego Pedroso (deguix) for StrTok

+ *  * Kevin English (kenglish_hi) for StrContains

+ *  * Hendri Adriaens (Smile2Me), Diego Pedroso (deguix), and Dan Fuhry  

+ *    (dandaman32) for StrReplace

+ *

+ *  Version 1.1 (compatibility with StrFunc.nsh)

+ *  * techtonik

+ *

+ *  http://nsis.sourceforge.net/Environmental_Variables:_append%2C_prepend%2C_and_remove_entries

+ *

+ */

+

+

+!ifndef ENVVARUPDATE_FUNCTION

+!define ENVVARUPDATE_FUNCTION

+!verbose push

+!verbose 3

+!include "LogicLib.nsh"

+!include "WinMessages.NSH"

+!include "StrFunc.nsh"

+

+; ---- Fix for conflict if StrFunc.nsh is already includes in main file -----------------------

+!macro _IncludeStrFunction StrFuncName

+  !ifndef ${StrFuncName}_INCLUDED

+    ${${StrFuncName}}

+  !endif

+  !ifndef Un${StrFuncName}_INCLUDED

+    ${Un${StrFuncName}}

+  !endif

+  !define un.${StrFuncName} "${Un${StrFuncName}}"

+!macroend

+

+!insertmacro _IncludeStrFunction StrTok

+!insertmacro _IncludeStrFunction StrStr

+!insertmacro _IncludeStrFunction StrRep

+

+; ---------------------------------- Macro Definitions ----------------------------------------

+!macro _EnvVarUpdateConstructor ResultVar EnvVarName Action Regloc PathString

+  Push "${EnvVarName}"

+  Push "${Action}"

+  Push "${RegLoc}"

+  Push "${PathString}"

+    Call EnvVarUpdate

+  Pop "${ResultVar}"

+!macroend

+!define EnvVarUpdate '!insertmacro "_EnvVarUpdateConstructor"'

+ 

+!macro _unEnvVarUpdateConstructor ResultVar EnvVarName Action Regloc PathString

+  Push "${EnvVarName}"

+  Push "${Action}"

+  Push "${RegLoc}"

+  Push "${PathString}"

+    Call un.EnvVarUpdate

+  Pop "${ResultVar}"

+!macroend

+!define un.EnvVarUpdate '!insertmacro "_unEnvVarUpdateConstructor"'

+; ---------------------------------- Macro Definitions end-------------------------------------

+ 

+;----------------------------------- EnvVarUpdate start----------------------------------------

+!define hklm_all_users     'HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"'

+!define hkcu_current_user  'HKCU "Environment"'

+ 

+!macro EnvVarUpdate UN

+ 

+Function ${UN}EnvVarUpdate

+ 

+  Push $0

+  Exch 4

+  Exch $1

+  Exch 3

+  Exch $2

+  Exch 2

+  Exch $3

+  Exch

+  Exch $4

+  Push $5

+  Push $6

+  Push $7

+  Push $8

+  Push $9

+  Push $R0

+ 

+  /* After this point:

+  -------------------------

+     $0 = ResultVar     (returned)

+     $1 = EnvVarName    (input)

+     $2 = Action        (input)

+     $3 = RegLoc        (input)

+     $4 = PathString    (input)

+     $5 = Orig EnvVar   (read from registry)

+     $6 = Len of $0     (temp)

+     $7 = tempstr1      (temp)

+     $8 = Entry counter (temp)

+     $9 = tempstr2      (temp)

+     $R0 = tempChar     (temp)  */

+ 

+  ; Step 1:  Read contents of EnvVarName from RegLoc

+  ;

+  ; Check for empty EnvVarName

+  ${If} $1 == ""

+    SetErrors

+    DetailPrint "ERROR: EnvVarName is blank"

+    Goto EnvVarUpdate_Restore_Vars

+  ${EndIf}

+ 

+  ; Check for valid Action

+  ${If}    $2 != "A"

+  ${AndIf} $2 != "P"

+  ${AndIf} $2 != "R"

+    SetErrors

+    DetailPrint "ERROR: Invalid Action - must be A, P, or R"

+    Goto EnvVarUpdate_Restore_Vars

+  ${EndIf}

+ 

+  ${If} $3 == HKLM

+    ReadRegStr $5 ${hklm_all_users} $1     ; Get EnvVarName from all users into $5

+  ${ElseIf} $3 == HKCU

+    ReadRegStr $5 ${hkcu_current_user} $1  ; Read EnvVarName from current user into $5

+  ${Else}

+    SetErrors

+    DetailPrint 'ERROR: Action is [$3] but must be "HKLM" or HKCU"'

+    Goto EnvVarUpdate_Restore_Vars

+  ${EndIf}

+ 

+  ; Check for empty PathString

+  ${If} $4 == ""

+    SetErrors

+    DetailPrint "ERROR: PathString is blank"

+    Goto EnvVarUpdate_Restore_Vars

+  ${EndIf}

+ 

+  ; Make sure we've got some work to do

+  ${If} $5 == ""

+  ${AndIf} $2 == "R"

+    SetErrors

+    DetailPrint "$1 is empty - Nothing to remove"

+    Goto EnvVarUpdate_Restore_Vars

+  ${EndIf}

+ 

+  ; Step 2: Scrub EnvVar

+  ;

+  StrCpy $0 $5                             ; Copy the contents to $0

+  ; Remove spaces around semicolons (NOTE: spaces before the 1st entry or

+  ; after the last one are not removed here but instead in Step 3)

+  ${If} $0 != ""                           ; If EnvVar is not empty ...

+    ${Do}

+      ${${UN}StrStr} $7 $0 " ;"

+      ${If} $7 == ""

+        ${ExitDo}

+      ${EndIf}

+      ${${UN}StrRep} $0  $0 " ;" ";"         ; Remove '<space>;'

+    ${Loop}

+    ${Do}

+      ${${UN}StrStr} $7 $0 "; "

+      ${If} $7 == ""

+        ${ExitDo}

+      ${EndIf}

+      ${${UN}StrRep} $0  $0 "; " ";"         ; Remove ';<space>'

+    ${Loop}

+    ${Do}

+      ${${UN}StrStr} $7 $0 ";;" 

+      ${If} $7 == ""

+        ${ExitDo}

+      ${EndIf}

+      ${${UN}StrRep} $0  $0 ";;" ";"

+    ${Loop}

+ 

+    ; Remove a leading or trailing semicolon from EnvVar

+    StrCpy  $7  $0 1 0

+    ${If} $7 == ";"

+      StrCpy $0  $0 "" 1                   ; Change ';<EnvVar>' to '<EnvVar>'

+    ${EndIf}

+    StrLen $6 $0

+    IntOp $6 $6 - 1

+    StrCpy $7  $0 1 $6

+    ${If} $7 == ";"

+     StrCpy $0  $0 $6                      ; Change ';<EnvVar>' to '<EnvVar>'

+    ${EndIf}

+    ; DetailPrint "Scrubbed $1: [$0]"      ; Uncomment to debug

+  ${EndIf}

+ 

+  /* Step 3. Remove all instances of the target path/string (even if "A" or "P")

+     $6 = bool flag (1 = found and removed PathString)

+     $7 = a string (e.g. path) delimited by semicolon(s)

+     $8 = entry counter starting at 0

+     $9 = copy of $0

+     $R0 = tempChar      */

+ 

+  ${If} $5 != ""                           ; If EnvVar is not empty ...

+    StrCpy $9 $0

+    StrCpy $0 ""

+    StrCpy $8 0

+    StrCpy $6 0

+ 

+    ${Do}

+      ${${UN}StrTok} $7 $9 ";" $8 "0"      ; $7 = next entry, $8 = entry counter

+ 

+      ${If} $7 == ""                       ; If we've run out of entries,

+        ${ExitDo}                          ;    were done

+      ${EndIf}                             ;

+ 

+      ; Remove leading and trailing spaces from this entry (critical step for Action=Remove)

+      ${Do}

+        StrCpy $R0  $7 1

+        ${If} $R0 != " "

+          ${ExitDo}

+        ${EndIf}

+        StrCpy $7   $7 "" 1                ;  Remove leading space

+      ${Loop}

+      ${Do}

+        StrCpy $R0  $7 1 -1

+        ${If} $R0 != " "

+          ${ExitDo}

+        ${EndIf}

+        StrCpy $7   $7 -1                  ;  Remove trailing space

+      ${Loop}

+      ${If} $7 == $4                       ; If string matches, remove it by not appending it

+        StrCpy $6 1                        ; Set 'found' flag

+      ${ElseIf} $7 != $4                   ; If string does NOT match

+      ${AndIf}  $0 == ""                   ;    and the 1st string being added to $0,

+        StrCpy $0 $7                       ;    copy it to $0 without a prepended semicolon

+      ${ElseIf} $7 != $4                   ; If string does NOT match

+      ${AndIf}  $0 != ""                   ;    and this is NOT the 1st string to be added to $0,

+        StrCpy $0 $0;$7                    ;    append path to $0 with a prepended semicolon

+      ${EndIf}                             ;

+ 

+      IntOp $8 $8 + 1                      ; Bump counter

+    ${Loop}                                ; Check for duplicates until we run out of paths

+  ${EndIf}

+ 

+  ; Step 4:  Perform the requested Action

+  ;

+  ${If} $2 != "R"                          ; If Append or Prepend

+    ${If} $6 == 1                          ; And if we found the target

+      DetailPrint "Target is already present in $1. It will be removed and"

+    ${EndIf}

+    ${If} $0 == ""                         ; If EnvVar is (now) empty

+      StrCpy $0 $4                         ;   just copy PathString to EnvVar

+      ${If} $6 == 0                        ; If found flag is either 0

+      ${OrIf} $6 == ""                     ; or blank (if EnvVarName is empty)

+        DetailPrint "$1 was empty and has been updated with the target"

+      ${EndIf}

+    ${ElseIf} $2 == "A"                    ;  If Append (and EnvVar is not empty),

+      StrCpy $0 $0;$4                      ;     append PathString

+      ${If} $6 == 1

+        DetailPrint "appended to $1"

+      ${Else}

+        DetailPrint "Target was appended to $1"

+      ${EndIf}

+    ${Else}                                ;  If Prepend (and EnvVar is not empty),

+      StrCpy $0 $4;$0                      ;     prepend PathString

+      ${If} $6 == 1

+        DetailPrint "prepended to $1"

+      ${Else}

+        DetailPrint "Target was prepended to $1"

+      ${EndIf}

+    ${EndIf}

+  ${Else}                                  ; If Action = Remove

+    ${If} $6 == 1                          ;   and we found the target

+      DetailPrint "Target was found and removed from $1"

+    ${Else}

+      DetailPrint "Target was NOT found in $1 (nothing to remove)"

+    ${EndIf}

+    ${If} $0 == ""

+      DetailPrint "$1 is now empty"

+    ${EndIf}

+  ${EndIf}

+ 

+  ; Step 5:  Update the registry at RegLoc with the updated EnvVar and announce the change

+  ;

+  ClearErrors

+  ${If} $3  == HKLM

+    WriteRegExpandStr ${hklm_all_users} $1 $0     ; Write it in all users section

+  ${ElseIf} $3 == HKCU

+    WriteRegExpandStr ${hkcu_current_user} $1 $0  ; Write it to current user section

+  ${EndIf}

+ 

+  IfErrors 0 +4

+    MessageBox MB_OK|MB_ICONEXCLAMATION "Could not write updated $1 to $3"

+    DetailPrint "Could not write updated $1 to $3"

+    Goto EnvVarUpdate_Restore_Vars

+ 

+  ; "Export" our change

+  SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} 0 "STR:Environment" /TIMEOUT=5000

+ 

+  EnvVarUpdate_Restore_Vars:

+  ;

+  ; Restore the user's variables and return ResultVar

+  Pop $R0

+  Pop $9

+  Pop $8

+  Pop $7

+  Pop $6

+  Pop $5

+  Pop $4

+  Pop $3

+  Pop $2

+  Pop $1

+  Push $0  ; Push my $0 (ResultVar)

+  Exch

+  Pop $0   ; Restore his $0

+ 

+FunctionEnd

+ 

+!macroend   ; EnvVarUpdate UN

+!insertmacro EnvVarUpdate ""

+!insertmacro EnvVarUpdate "un."

+;----------------------------------- EnvVarUpdate end----------------------------------------

+ 

+!verbose pop

+!endif

diff --git a/packaging/windows-exe/rabbitmq.ico b/packaging/windows-exe/rabbitmq.ico
new file mode 100644
index 0000000000..5e169a7996
--- /dev/null
+++ b/packaging/windows-exe/rabbitmq.ico
diff --git a/packaging/windows-exe/rabbitmq_nsi.in b/packaging/windows-exe/rabbitmq_nsi.in
new file mode 100644
index 0000000000..6d79ffd4fc
--- /dev/null
+++ b/packaging/windows-exe/rabbitmq_nsi.in
@@ -0,0 +1,241 @@
+; Use the "Modern" UI
+!include MUI2.nsh
+!include LogicLib.nsh
+!include WinMessages.nsh
+!include FileFunc.nsh
+!include WordFunc.nsh
+!include lib\EnvVarUpdate.nsh
+
+!define env_hklm 'HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"'
+!define uninstall "Software\Microsoft\Windows\CurrentVersion\Uninstall\RabbitMQ"
+
+;--------------------------------
+
+; The name of the installer
+Name "RabbitMQ Server %%VERSION%%"
+
+; The file to write
+OutFile "rabbitmq-server-%%VERSION%%.exe"
+
+; Icons
+!define MUI_ICON "rabbitmq.ico"
+
+; The default installation directory
+InstallDir "$PROGRAMFILES\RabbitMQ Server"
+
+; Registry key to check for directory (so if you install again, it will
+; overwrite the old one automatically)
+InstallDirRegKey HKLM "Software\VMware, Inc.\RabbitMQ Server" "Install_Dir"
+
+; Request application privileges for Windows Vista
+RequestExecutionLevel admin
+
+SetCompressor /solid lzma
+
+VIProductVersion "%%VERSION%%.0"
+VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductVersion" "%%VERSION%%"
+VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "RabbitMQ Server"
+;VIAddVersionKey /LANG=${LANG_ENGLISH} "Comments" ""
+VIAddVersionKey /LANG=${LANG_ENGLISH} "CompanyName" "VMware, Inc"
+;VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalTrademarks" "" ; TODO ?
+VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalCopyright" "Copyright (c) 2007-2011 VMware, Inc.  All rights reserved."
+VIAddVersionKey /LANG=${LANG_ENGLISH} "FileDescription" "RabbitMQ Server"
+VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "%%VERSION%%"
+
+;--------------------------------
+
+; Pages
+
+
+;  !insertmacro MUI_PAGE_LICENSE "..\..\LICENSE-MPL-RabbitMQ"
+  !insertmacro MUI_PAGE_COMPONENTS
+  !insertmacro MUI_PAGE_DIRECTORY
+  !insertmacro MUI_PAGE_INSTFILES
+  !insertmacro MUI_PAGE_FINISH
+
+  !insertmacro MUI_UNPAGE_CONFIRM
+  !insertmacro MUI_UNPAGE_INSTFILES
+  !define MUI_FINISHPAGE_TEXT "RabbitMQ Server %%VERSION%% has been uninstalled from your computer.$\n$\nPlease note that the log and database directories located at $APPDATA\RabbitMQ have not been removed. You can remove them manually if desired."
+  !insertmacro MUI_UNPAGE_FINISH
+
+;--------------------------------
+;Languages
+
+  !insertmacro MUI_LANGUAGE "English"
+
+;--------------------------------
+
+; The stuff to install
+Section "RabbitMQ Server (required)" Rabbit
+
+  SectionIn RO
+
+  ; Set output path to the installation directory.
+  SetOutPath $INSTDIR
+
+  ; Put files there
+  File /r "rabbitmq_server-%%VERSION%%"
+  File "rabbitmq.ico"
+
+  ; Add to PATH
+  ${EnvVarUpdate} $0 "PATH" "A" "HKLM" "$INSTDIR\rabbitmq_server-%%VERSION%%\sbin"
+
+  ; Write the installation path into the registry
+  WriteRegStr HKLM "SOFTWARE\VMware, Inc.\RabbitMQ Server" "Install_Dir" "$INSTDIR"
+
+  ; Write the uninstall keys for Windows
+  WriteRegStr HKLM ${uninstall} "DisplayName" "RabbitMQ Server"
+  WriteRegStr HKLM ${uninstall} "UninstallString" "$INSTDIR\uninstall.exe"
+  WriteRegStr HKLM ${uninstall} "DisplayIcon" "$INSTDIR\uninstall.exe,0"
+  WriteRegStr HKLM ${uninstall} "Publisher" "VMware, Inc."
+  WriteRegStr HKLM ${uninstall} "DisplayVersion" "%%VERSION%%"
+  WriteRegDWORD HKLM ${uninstall} "NoModify" 1
+  WriteRegDWORD HKLM ${uninstall} "NoRepair" 1
+
+  ${GetSize} "$INSTDIR" "/S=0K" $0 $1 $2
+  IntFmt $0 "0x%08X" $0
+  WriteRegDWORD HKLM "${uninstall}" "EstimatedSize" "$0"
+
+  WriteUninstaller "uninstall.exe"
+SectionEnd
+
+;--------------------------------
+
+Section "RabbitMQ Service" RabbitService
+  ExpandEnvStrings $0 %COMSPEC%
+  ExecWait '"$0" /C "$INSTDIR\rabbitmq_server-%%VERSION%%\sbin\rabbitmq-service.bat" install'
+  ExecWait '"$0" /C "$INSTDIR\rabbitmq_server-%%VERSION%%\sbin\rabbitmq-service.bat" start'
+  CopyFiles "$WINDIR\.erlang.cookie" "$PROFILE\.erlang.cookie"
+SectionEnd
+
+;--------------------------------
+
+Section "Start Menu" RabbitStartMenu
+  ; In case the service is not installed, or the service installation fails,
+  ; make sure these exist or Explorer will get confused.
+  CreateDirectory "$APPDATA\RabbitMQ\log"
+  CreateDirectory "$APPDATA\RabbitMQ\db"
+
+  CreateDirectory "$SMPROGRAMS\RabbitMQ Server"
+  CreateShortCut "$SMPROGRAMS\RabbitMQ Server\Uninstall.lnk" "$INSTDIR\uninstall.exe" "" "$INSTDIR\uninstall.exe" 0
+  CreateShortCut "$SMPROGRAMS\RabbitMQ Server\Plugins Directory.lnk" "$INSTDIR\rabbitmq_server-%%VERSION%%\plugins"
+  CreateShortCut "$SMPROGRAMS\RabbitMQ Server\Log Directory.lnk" "$APPDATA\RabbitMQ\log"
+  CreateShortCut "$SMPROGRAMS\RabbitMQ Server\Database Directory.lnk" "$APPDATA\RabbitMQ\db"
+  CreateShortCut "$SMPROGRAMS\RabbitMQ Server\(Re)Install Service.lnk" "$INSTDIR\rabbitmq_server-%%VERSION%%\sbin\rabbitmq-service.bat" "install" "$INSTDIR\rabbitmq.ico"
+  CreateShortCut "$SMPROGRAMS\RabbitMQ Server\Remove Service.lnk" "$INSTDIR\rabbitmq_server-%%VERSION%%\sbin\rabbitmq-service.bat" "remove" "$INSTDIR\rabbitmq.ico"
+  CreateShortCut "$SMPROGRAMS\RabbitMQ Server\Start Service.lnk" "$INSTDIR\rabbitmq_server-%%VERSION%%\sbin\rabbitmq-service.bat" "start" "$INSTDIR\rabbitmq.ico"
+  CreateShortCut "$SMPROGRAMS\RabbitMQ Server\Stop Service.lnk" "$INSTDIR\rabbitmq_server-%%VERSION%%\sbin\rabbitmq-service.bat" "stop" "$INSTDIR\rabbitmq.ico"
+
+SectionEnd
+
+;--------------------------------
+
+; Section descriptions
+
+LangString DESC_Rabbit ${LANG_ENGLISH} "The RabbitMQ Server."
+LangString DESC_RabbitService ${LANG_ENGLISH} "Set up RabbitMQ as a Windows Service."
+LangString DESC_RabbitStartMenu ${LANG_ENGLISH} "Add some useful links to the start menu."
+
+!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
+  !insertmacro MUI_DESCRIPTION_TEXT ${Rabbit} $(DESC_Rabbit)
+  !insertmacro MUI_DESCRIPTION_TEXT ${RabbitService} $(DESC_RabbitService)
+  !insertmacro MUI_DESCRIPTION_TEXT ${RabbitStartMenu} $(DESC_RabbitStartMenu)
+!insertmacro MUI_FUNCTION_DESCRIPTION_END
+
+;--------------------------------
+
+; Uninstaller
+
+Section "Uninstall"
+
+  ; Remove registry keys
+  DeleteRegKey HKLM ${uninstall}
+  DeleteRegKey HKLM "SOFTWARE\VMware, Inc.\RabbitMQ Server"
+
+  ; TODO these will fail if the service is not installed - do we care?
+  ExpandEnvStrings $0 %COMSPEC%
+  ExecWait '"$0" /C "$INSTDIR\rabbitmq_server-%%VERSION%%\sbin\rabbitmq-service.bat" stop'
+  ExecWait '"$0" /C "$INSTDIR\rabbitmq_server-%%VERSION%%\sbin\rabbitmq-service.bat" remove'
+
+  ; Remove from PATH
+  ${un.EnvVarUpdate} $0 "PATH" "R" "HKLM" "$INSTDIR\rabbitmq_server-%%VERSION%%\sbin"
+
+  ; Remove files and uninstaller
+  RMDir /r "$INSTDIR\rabbitmq_server-%%VERSION%%"
+  Delete "$INSTDIR\rabbitmq.ico"
+  Delete "$INSTDIR\uninstall.exe"
+
+  ; Remove start menu items
+  RMDir /r "$SMPROGRAMS\RabbitMQ Server"
+
+  DeleteRegValue ${env_hklm} ERLANG_HOME
+  SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} 0 "STR:Environment" /TIMEOUT=5000
+
+SectionEnd
+
+;--------------------------------
+
+; Functions
+
+Function .onInit
+  Call findErlang
+
+  ReadRegStr $0 HKLM ${uninstall} "UninstallString"
+  ${If} $0 != ""
+    MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION "RabbitMQ is already installed. $\n$\nClick 'OK' to remove the previous version or 'Cancel' to cancel this installation." IDCANCEL norun
+
+    ;Run the uninstaller
+    ClearErrors
+    ExecWait $INSTDIR\uninstall.exe
+
+    norun:
+    Abort
+  ${EndIf}
+FunctionEnd
+
+Function findErlang
+
+  StrCpy $0 0
+  StrCpy $2 "not-found"
+  ${Do}
+    EnumRegKey $1 HKLM Software\Ericsson\Erlang $0
+    ${If} $1 = ""
+      ${Break}
+    ${EndIf}
+    ${If} $1 <> "ErlSrv"
+      StrCpy $2 $1
+    ${EndIf}
+
+    IntOp $0 $0 + 1
+  ${Loop}
+
+  ${If} $2 = "not-found"
+    MessageBox MB_YESNO|MB_ICONEXCLAMATION "Erlang could not be detected.$\nYou must install Erlang before installing RabbitMQ. Would you like the installer to open a browser window to the Erlang download site?" IDNO abort
+    ExecShell "open" "http://www.erlang.org/download.html"
+    abort:
+    Abort
+  ${Else}
+    ${VersionCompare} $2 "5.6.3" $0
+    ${VersionCompare} $2 "5.8.1" $1
+
+    ${If} $0 = 2
+      MessageBox MB_OK|MB_ICONEXCLAMATION "Your installed version of Erlang ($2) is too old. Please install a more recent version."
+      Abort
+    ${ElseIf} $1 = 2
+      MessageBox MB_YESNO|MB_ICONEXCLAMATION "Your installed version of Erlang ($2) is comparatively old.$\nFor best results, please install a newer version.$\nDo you wish to continue?" IDYES no_abort
+      Abort
+      no_abort:
+    ${EndIf}
+
+    ReadRegStr $0 HKLM "Software\Ericsson\Erlang\$2" ""
+
+    ; See http://nsis.sourceforge.net/Setting_Environment_Variables
+    WriteRegExpandStr ${env_hklm} ERLANG_HOME $0
+    SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} 0 "STR:Environment" /TIMEOUT=5000
+
+    ; On Windows XP changing the permanent environment does not change *our*
+    ; environment, so do that as well.
+    System::Call 'Kernel32::SetEnvironmentVariableA(t, t) i("ERLANG_HOME", "$0").r0'
+  ${EndIf}
+
+FunctionEnd
\ No newline at end of file
diff --git a/packaging/windows/Makefile b/packaging/windows/Makefile
index abe174e08e..dacfa6207f 100644
--- a/packaging/windows/Makefile
+++ b/packaging/windows/Makefile
@@ -11,7 +11,6 @@ dist:
 	mv $(SOURCE_DIR)/scripts/rabbitmq-server.bat $(SOURCE_DIR)/sbin
 	mv $(SOURCE_DIR)/scripts/rabbitmq-service.bat $(SOURCE_DIR)/sbin
 	mv $(SOURCE_DIR)/scripts/rabbitmqctl.bat $(SOURCE_DIR)/sbin
-	mv $(SOURCE_DIR)/scripts/rabbitmq-multi.bat $(SOURCE_DIR)/sbin
 	rm -rf $(SOURCE_DIR)/scripts
 	rm -rf $(SOURCE_DIR)/codegen* $(SOURCE_DIR)/Makefile
 	rm -f $(SOURCE_DIR)/README