diff options
| -rw-r--r-- | ebin/rabbit.app | 1 | ||||
| -rwxr-xr-x | scripts/rabbitmq-server | 5 | ||||
| -rw-r--r-- | src/rabbit.erl | 9 |
3 files changed, 9 insertions, 6 deletions
diff --git a/ebin/rabbit.app b/ebin/rabbit.app index c667d04847..c542c8aaa0 100644 --- a/ebin/rabbit.app +++ b/ebin/rabbit.app @@ -51,6 +51,7 @@ {applications, [kernel, stdlib, sasl, mnesia, os_mon]}, {mod, {rabbit, []}}, {env, [{tcp_listeners, [{"0.0.0.0", 5672}]}, + {ssl_listeners, []}, {extra_startup_steps, []}, {default_user, <<"guest">>}, {default_pass, <<"guest">>}, diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server index 403b6e801d..572262c97e 100755 --- a/scripts/rabbitmq-server +++ b/scripts/rabbitmq-server @@ -38,10 +38,6 @@ [ "x" = "x$RABBITMQ_NODE_IP_ADDRESS" ] && RABBITMQ_NODE_IP_ADDRESS=0.0.0.0 [ "x" = "x$RABBITMQ_NODE_PORT" ] && RABBITMQ_NODE_PORT=${NODE_PORT} [ "x" = "x$RABBITMQ_NODE_PORT" ] && RABBITMQ_NODE_PORT=5672 -[ "x" = "x$RABBITMQ_SSL_IP_ADDRESS" ] && RABBITMQ_SSL_IP_ADDRESS=${SSL_IP_ADDRESS} -[ "x" = "x$RABBITMQ_SSL_IP_ADDRESS" ] && RABBITMQ_SSL_IP_ADDRESS=0.0.0.0 -[ "x" = "x$RABBITMQ_SSL_PORT" ] && RABBITMQ_SSL_PORT=${SSL_PORT} -[ "x" = "x$RABBITMQ_SSL_PORT" ] && RABBITMQ_SSL_PORT=5673 [ "x" = "x$RABBITMQ_SERVER_ERL_ARGS" ] && RABBITMQ_SERVER_ERL_ARGS=${SERVER_ERL_ARGS} [ "x" = "x$RABBITMQ_SERVER_ERL_ARGS" ] && RABBITMQ_SERVER_ERL_ARGS="+K true +A30 \ -kernel inet_default_listen_options [{nodelay,true},{sndbuf,16384},{recbuf,4096}] \ @@ -85,7 +81,6 @@ exec erl \ +W w \ ${RABBITMQ_SERVER_ERL_ARGS} \ -rabbit tcp_listeners '[{"'${RABBITMQ_NODE_IP_ADDRESS}'", '${RABBITMQ_NODE_PORT}'}]' \ - -rabbit ssl_listeners '[{"'${RABBITMQ_SSL_IP_ADDRESS}'", '${RABBITMQ_SSL_PORT}'}]' \ -sasl errlog_type error \ -kernel error_logger '{file,"'${RABBITMQ_LOGS}'"}' \ -sasl sasl_error_logger '{file,"'${RABBITMQ_SASL_LOGS}'"}' \ diff --git a/src/rabbit.erl b/src/rabbit.erl index 6891fe736f..81685529e0 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl @@ -48,7 +48,7 @@ -include("rabbit_framing.hrl"). -include("rabbit.hrl"). --define(APPS, [os_mon, mnesia, crypto, ssl, rabbit]). +-define(APPS, [os_mon, mnesia, crypto, rabbit]). %%---------------------------------------------------------------------------- @@ -202,6 +202,13 @@ start(normal, []) -> {"SSL listeners", fun () -> {ok, SSLListeners} = application:get_env(ssl_listeners), + case length(SSLListeners) of + 0 -> + continue; + _Len -> + ok = start_applications([ssl]) + end, + lists:foreach( fun ({Host, Port}) -> ok = rabbit_networking:start_ssl_listener(Host, Port) |