summaryrefslogtreecommitdiff
path: root/scripts/rabbitmq-server
diff options
context:
space:
mode:
authorDavid Wragg <dpw@lshift.net>2010-02-11 14:29:57 +0000
committerDavid Wragg <dpw@lshift.net>2010-02-11 14:29:57 +0000
commit3b94b84aef2a70e70b9f40673f628a9b2f9617b7 (patch)
treefa77b9acb3b4ad571d190aaf8f527c97761edea8 /scripts/rabbitmq-server
parent3d7dd610e0a6733617909e608ff43ae7f0acf7ac (diff)
parent3cce88989da7f84bdfc8d7af73ba6c2b23982a07 (diff)
downloadrabbitmq-server-git-3b94b84aef2a70e70b9f40673f628a9b2f9617b7.tar.gz
Merge bug22336 into default
Diffstat (limited to 'scripts/rabbitmq-server')
-rwxr-xr-xscripts/rabbitmq-server4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server
index dde0dea238..638498c1e2 100755
--- a/scripts/rabbitmq-server
+++ b/scripts/rabbitmq-server
@@ -44,8 +44,8 @@ SERVER_START_ARGS=
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" ]