Removed all traces of tcp_listeners from the scripts

5 files changed, 0 insertions, 37 deletions

diff --git a/scripts/rabbitmq-multi b/scripts/rabbitmq-multi
index 7db4cb70b2..73502ec279 100755
--- a/scripts/rabbitmq-multi
+++ b/scripts/rabbitmq-multi
@@ -30,8 +30,6 @@
 ##   Contributor(s): ______________________________________.
 ##
 NODENAME=rabbit
-NODE_IP_ADDRESS=0.0.0.0
-NODE_PORT=5672
 SCRIPT_HOME=$(dirname $0)
 PIDS_FILE=/var/lib/rabbitmq/pids
 MULTI_ERL_ARGS=
@@ -40,8 +38,6 @@ MULTI_START_ARGS=
 . `dirname $0`/rabbitmq-env
 
 [ "x" = "x$RABBITMQ_NODENAME" ] && RABBITMQ_NODENAME=${NODENAME}
-[ "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_SCRIPT_HOME" ] && RABBITMQ_SCRIPT_HOME=${SCRIPT_HOME}
 [ "x" = "x$RABBITMQ_PIDS_FILE" ] && RABBITMQ_PIDS_FILE=${PIDS_FILE}
 [ "x" = "x$RABBITMQ_MULTI_ERL_ARGS" ] && RABBITMQ_MULTI_ERL_ARGS=${MULTI_ERL_ARGS}
@@ -49,8 +45,6 @@ MULTI_START_ARGS=
 
 export \
     RABBITMQ_NODENAME \
-    RABBITMQ_NODE_IP_ADDRESS \
-    RABBITMQ_NODE_PORT \
     RABBITMQ_SCRIPT_HOME \
     RABBITMQ_PIDS_FILE
 
diff --git a/scripts/rabbitmq-multi.bat b/scripts/rabbitmq-multi.bat
index 8de18405b7..0d814d9256 100755
--- a/scripts/rabbitmq-multi.bat
+++ b/scripts/rabbitmq-multi.bat
@@ -40,14 +40,6 @@ if "%RABBITMQ_NODENAME%"=="" (
     set RABBITMQ_NODENAME=rabbit

 )

 

-if "%RABBITMQ_NODE_IP_ADDRESS%"=="" (

-    set RABBITMQ_NODE_IP_ADDRESS=0.0.0.0

-)

-

-if "%RABBITMQ_NODE_PORT%"=="" (

-    set RABBITMQ_NODE_PORT=5672

-)

-

 set RABBITMQ_PIDS_FILE=%RABBITMQ_BASE%\rabbitmq.pids

 set RABBITMQ_SCRIPT_HOME=%~sdp0%

 

diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server
index 310afe9426..693b0f528b 100755
--- a/scripts/rabbitmq-server
+++ b/scripts/rabbitmq-server
@@ -31,8 +31,6 @@
 ##
 
 NODENAME=rabbit
-NODE_IP_ADDRESS=0.0.0.0
-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}]"
@@ -45,8 +43,6 @@ SERVER_START_ARGS=
 . `dirname $0`/rabbitmq-env
 
 [ "x" = "x$RABBITMQ_NODENAME" ] && RABBITMQ_NODENAME=${NODENAME}
-[ "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_SERVER_ERL_ARGS" ] && RABBITMQ_SERVER_ERL_ARGS=${SERVER_ERL_ARGS}
 [ "x" = "x$RABBITMQ_CLUSTER_CONFIG_FILE" ] && RABBITMQ_CLUSTER_CONFIG_FILE=${CLUSTER_CONFIG_FILE}
 [ "x" = "x$RABBITMQ_CONFIG_FILE" ] && RABBITMQ_CONFIG_FILE=${CONFIG_FILE}
@@ -102,7 +98,6 @@ exec erl \
     ${RABBITMQ_CONFIG_ARG} \
     +W w \
     ${RABBITMQ_SERVER_ERL_ARGS} \
-    -rabbit tcp_listeners '[{"'${RABBITMQ_NODE_IP_ADDRESS}'", '${RABBITMQ_NODE_PORT}'}]' \
     -sasl errlog_type error \
     -kernel error_logger '{file,"'${RABBITMQ_LOGS}'"}' \
     -sasl sasl_error_logger '{file,"'${RABBITMQ_SASL_LOGS}'"}' \
diff --git a/scripts/rabbitmq-server.bat b/scripts/rabbitmq-server.bat
index 211fc78190..cad8e97891 100755
--- a/scripts/rabbitmq-server.bat
+++ b/scripts/rabbitmq-server.bat
@@ -40,14 +40,6 @@ if "%RABBITMQ_NODENAME%"=="" (
     set RABBITMQ_NODENAME=rabbit

 )

 

-if "%RABBITMQ_NODE_IP_ADDRESS%"=="" (

-    set RABBITMQ_NODE_IP_ADDRESS=0.0.0.0

-)

-

-if "%RABBITMQ_NODE_PORT%"=="" (

-    set RABBITMQ_NODE_PORT=5672

-)

-

 if not exist "%ERLANG_HOME%\bin\erl.exe" (

     echo.

     echo ******************************

@@ -132,7 +124,6 @@ if exist "%RABBITMQ_CONFIG_FILE%.config" (
 +A30 ^

 -kernel inet_default_listen_options "[{nodelay, true}, {sndbuf, 16384}, {recbuf, 4096}]" ^

 -kernel inet_default_connect_options "[{nodelay, true}]" ^

--rabbit tcp_listeners "[{\"%RABBITMQ_NODE_IP_ADDRESS%\", %RABBITMQ_NODE_PORT%}]" ^

 -kernel error_logger {file,\""%RABBITMQ_LOG_BASE%/%RABBITMQ_NODENAME%.log"\"} ^

 %RABBITMQ_SERVER_ERL_ARGS% ^

 -sasl errlog_type error ^

diff --git a/scripts/rabbitmq-service.bat b/scripts/rabbitmq-service.bat
index d80df9677f..5abec51cb0 100755
--- a/scripts/rabbitmq-service.bat
+++ b/scripts/rabbitmq-service.bat
@@ -44,14 +44,6 @@ if "%RABBITMQ_NODENAME%"=="" (
     set RABBITMQ_NODENAME=rabbit

 )

 

-if "%RABBITMQ_NODE_IP_ADDRESS%"=="" (

-    set RABBITMQ_NODE_IP_ADDRESS=0.0.0.0

-)

-

-if "%RABBITMQ_NODE_PORT%"=="" (

-    set RABBITMQ_NODE_PORT=5672

-)

-

 if "%ERLANG_SERVICE_MANAGER_PATH%"=="" (

     set ERLANG_SERVICE_MANAGER_PATH=C:\Program Files\erl5.6.5\erts-5.6.5\bin

 )

@@ -188,7 +180,6 @@ set ERLANG_SERVICE_ARGUMENTS= ^
 +A30 ^

 -kernel inet_default_listen_options "[{nodelay,true},{sndbuf,16384},{recbuf,4096}]" ^

 -kernel inet_default_connect_options "[{nodelay,true}]" ^

--rabbit tcp_listeners "[{\"%RABBITMQ_NODE_IP_ADDRESS%\",%RABBITMQ_NODE_PORT%}]" ^

 -kernel error_logger {file,\""%RABBITMQ_LOG_BASE%/%RABBITMQ_NODENAME%.log"\"} ^

 %RABBITMQ_SERVER_ERL_ARGS% ^

 -sasl errlog_type error ^