diff options
| author | Matthias Radestock <matthias@lshift.net> | 2010-02-12 11:29:21 +0000 |
|---|---|---|
| committer | Matthias Radestock <matthias@lshift.net> | 2010-02-12 11:29:21 +0000 |
| commit | dc574a8ef52dd292084dedfc0692665285f3a7a7 (patch) | |
| tree | 6155a3c078624d4e36f9ff0d337e48f084f2bd38 /scripts | |
| parent | 94fb9309966e6aab82d2514027d873865f02ae9b (diff) | |
| parent | 0cf466290e35a3dc97a9541d0850a457c1c73a6a (diff) | |
| download | rabbitmq-server-git-dc574a8ef52dd292084dedfc0692665285f3a7a7.tar.gz | |
merge heads
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/rabbitmq-multi | 4 | ||||
| -rwxr-xr-x | scripts/rabbitmq-server | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/scripts/rabbitmq-multi b/scripts/rabbitmq-multi index 907dce36c8..8341d35c8c 100755 --- a/scripts/rabbitmq-multi +++ b/scripts/rabbitmq-multi @@ -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" ] 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" ] |