Merge bug 22961

2 files changed, 43 insertions, 12 deletions

diff --git a/scripts/rabbitmq-defaults b/scripts/rabbitmq-defaults
new file mode 100644
index 0000000000..4763f0867c
--- /dev/null
+++ b/scripts/rabbitmq-defaults
@@ -0,0 +1,30 @@
+#!/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/
+##
+##  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 Initial Developer of the Original Code is VMware, Inc.
+##  Copyright (c) 2012 VMware, Inc.  All rights reserved.
+##
+
+### next line potentially updated in package install steps
+SYS_PREFIX=
+
+## Set default values
+
+CONFIG_FILE=${SYS_PREFIX}/etc/rabbitmq/rabbitmq
+LOG_BASE=${SYS_PREFIX}/var/log/rabbitmq
+MNESIA_BASE=${SYS_PREFIX}/var/lib/rabbitmq/mnesia
+ENABLED_PLUGINS_FILE=${SYS_PREFIX}/etc/rabbitmq/enabled_plugins
+
+PLUGINS_DIR="${RABBITMQ_HOME}/plugins"
+
+CONF_ENV_FILE=${SYS_PREFIX}/etc/rabbitmq/rabbitmq-env.conf
diff --git a/scripts/rabbitmq-env b/scripts/rabbitmq-env
index 1fd1339da2..23224943fe 100755
--- a/scripts/rabbitmq-env
+++ b/scripts/rabbitmq-env
@@ -15,7 +15,8 @@
 ##  Copyright (c) 2007-2012 VMware, Inc.  All rights reserved.
 ##
 
-# Determine where this script is really located
+# Determine where this script is really located (if this script is
+# invoked from another script, this is the location of the caller)
 SCRIPT_PATH="$0"
 while [ -h "$SCRIPT_PATH" ] ; do
     FULL_PATH=`readlink -f $SCRIPT_PATH 2>/dev/null`
@@ -36,19 +37,19 @@ RABBITMQ_HOME="${SCRIPT_DIR}/.."
 [ "x" = "x$HOSTNAME" ] && HOSTNAME=`env hostname`
 NODENAME=rabbit@${HOSTNAME%%.*}
 
-## Set (non-empty) default values for rabbitmq-env.conf variables to override
+## Set defaults
+. ${SCRIPT_DIR}/rabbitmq-defaults
+
+## Common defaults
 SERVER_ERL_ARGS="+K true +A30 +P 1048576 \
--kernel inet_default_connect_options [{nodelay,true}]"
-CONFIG_FILE=/etc/rabbitmq/rabbitmq
-LOG_BASE=/var/log/rabbitmq
-MNESIA_BASE=/var/lib/rabbitmq/mnesia
-PLUGINS_DIR="${RABBITMQ_HOME}/plugins"
-ENABLED_PLUGINS_FILE=/etc/rabbitmq/enabled_plugins
+  -kernel inet_default_connect_options [{nodelay,true}]"
 
-## Load configuration from the rabbitmq.conf file
+# warn about old rabbitmq.conf file, if no new one
 if [ -f /etc/rabbitmq/rabbitmq.conf ] && \
-   [ ! -f /etc/rabbitmq/rabbitmq-env.conf ] ; then
+   [ ! -f ${CONF_ENV_FILE} ] ; then
     echo -n "WARNING: ignoring /etc/rabbitmq/rabbitmq.conf -- "
-    echo "location has moved to /etc/rabbitmq/rabbitmq-env.conf"
+    echo "location has moved to ${CONF_ENV_FILE}"
 fi
-[ -f /etc/rabbitmq/rabbitmq-env.conf ] && . /etc/rabbitmq/rabbitmq-env.conf
+
+## Get configuration variables from the configure environment file
+[ -f ${CONF_ENV_FILE} ] && . ${CONF_ENV_FILE}