summaryrefslogtreecommitdiff
path: root/scripts/rabbitmq-multi
diff options
context:
space:
mode:
authorMatthew Sackman <matthew@lshift.net>2010-02-19 15:08:41 +0000
committerMatthew Sackman <matthew@lshift.net>2010-02-19 15:08:41 +0000
commit952d6fcee0a38e2ece3aae4323d5b870bf72c585 (patch)
tree77d284ba5ed7ee4478ff470a02faed4844870e5d /scripts/rabbitmq-multi
parent61a8de863032ccea2b9f4e53a81dff964091a9a5 (diff)
parente1107dc9ab7ab91e8a3ce9f95f4cf85773aed3cc (diff)
downloadrabbitmq-server-git-952d6fcee0a38e2ece3aae4323d5b870bf72c585.tar.gz
merging default into bug 22169
Diffstat (limited to 'scripts/rabbitmq-multi')
-rwxr-xr-xscripts/rabbitmq-multi10
1 files changed, 5 insertions, 5 deletions
diff --git a/scripts/rabbitmq-multi b/scripts/rabbitmq-multi
index a6eb102a4b..8341d35c8c 100755
--- a/scripts/rabbitmq-multi
+++ b/scripts/rabbitmq-multi
@@ -19,11 +19,11 @@
## are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
## Technologies LLC, and Rabbit Technologies Ltd.
##
-## Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift
+## Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift
## Ltd. Portions created by Cohesive Financial Technologies LLC are
-## Copyright (C) 2007-2009 Cohesive Financial Technologies
+## Copyright (C) 2007-2010 Cohesive Financial Technologies
## LLC. Portions created by Rabbit Technologies Ltd are Copyright
-## (C) 2007-2009 Rabbit Technologies Ltd.
+## (C) 2007-2010 Rabbit Technologies Ltd.
##
## All Rights Reserved.
##
@@ -40,8 +40,8 @@ CONFIG_FILE=/etc/rabbitmq/rabbitmq
DEFAULT_NODE_IP_ADDRESS=0.0.0.0
DEFAULT_NODE_PORT=5672
-[ "x" = "x$RABBITMQ_NODE_IP_ADDRESS" ] && RABBITMQ_NODE_IP_ADDRESS=${NODE_IP_ADDRESS}
-[ "x" = "x$RABBITMQ_NODE_PORT" ] && RABBITMQ_NODE_PORT=${NODE_PORT}
+[ "x" = "x$RABBITMQ_NODE_IP_ADDRESS" ] && [ "x" != "x$NODE_IP_ADDRESS" ] && RABBITMQ_NODE_IP_ADDRESS=${NODE_IP_ADDRESS}
+[ "x" = "x$RABBITMQ_NODE_PORT" ] && [ "x" != "x$NODE_PORT" ] && RABBITMQ_NODE_PORT=${NODE_PORT}
if [ "x" = "x$RABBITMQ_NODE_IP_ADDRESS" ]
then
if [ "x" != "x$RABBITMQ_NODE_PORT" ]