diff options
| author | Matthew Sackman <matthew@lshift.net> | 2010-01-15 16:47:11 +0000 |
|---|---|---|
| committer | Matthew Sackman <matthew@lshift.net> | 2010-01-15 16:47:11 +0000 |
| commit | 5be0d84dbe38bd1303facd13032985d4c906e96b (patch) | |
| tree | 465d2ba3f2051d63cc4a98ed693f2b17eb8b5ad3 | |
| parent | b8d4e87b64098e5be1280a152c2f8a3683d21f7c (diff) | |
| download | rabbitmq-server-git-5be0d84dbe38bd1303facd13032985d4c906e96b.tar.gz | |
The DEFAULT_ values should not be available to the .conf file
| -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 b66a7dab76..a6eb102a4b 100755 --- a/scripts/rabbitmq-multi +++ b/scripts/rabbitmq-multi @@ -30,8 +30,6 @@ ## Contributor(s): ______________________________________. ## NODENAME=rabbit -DEFAULT_NODE_IP_ADDRESS=0.0.0.0 -DEFAULT_NODE_PORT=5672 SCRIPT_HOME=$(dirname $0) PIDS_FILE=/var/lib/rabbitmq/pids MULTI_ERL_ARGS= @@ -40,6 +38,8 @@ CONFIG_FILE=/etc/rabbitmq/rabbitmq . `dirname $0`/rabbitmq-env +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} if [ "x" = "x$RABBITMQ_NODE_IP_ADDRESS" ] diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server index c6837bbcb4..cbc295f7d9 100755 --- a/scripts/rabbitmq-server +++ b/scripts/rabbitmq-server @@ -31,8 +31,6 @@ ## NODENAME=rabbit -DEFAULT_NODE_IP_ADDRESS=0.0.0.0 -DEFAULT_NODE_PORT=5672 SERVER_ERL_ARGS="+K true +A30 \ -kernel inet_default_listen_options [{nodelay,true},{sndbuf,16384},{recbuf,4096}] \ -kernel inet_default_connect_options [{nodelay,true}]" @@ -44,6 +42,8 @@ SERVER_START_ARGS= . `dirname $0`/rabbitmq-env +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} if [ "x" = "x$RABBITMQ_NODE_IP_ADDRESS" ] |