diff --git a/deps/rabbitmq_management/priv/www/js/tmpl/overview.ejs b/deps/rabbitmq_management/priv/www/js/tmpl/overview.ejs index 6276f10d8771..4d63c7fbd579 100644 --- a/deps/rabbitmq_management/priv/www/js/tmpl/overview.ejs +++ b/deps/rabbitmq_management/priv/www/js/tmpl/overview.ejs @@ -252,6 +252,7 @@ <% } %> Bound to Port + SSL <% for (var i = 0; i < overview.listeners.length; i++) { @@ -264,6 +265,7 @@ <% } %> <%= listener.ip_address %> <%= listener.port %> + <%= fmt_boolean(listener.ssl || false) %> <% } %> diff --git a/deps/rabbitmq_management_agent/src/rabbit_mgmt_format.erl b/deps/rabbitmq_management_agent/src/rabbit_mgmt_format.erl index 87004d03781f..620ed85dc60a 100644 --- a/deps/rabbitmq_management_agent/src/rabbit_mgmt_format.erl +++ b/deps/rabbitmq_management_agent/src/rabbit_mgmt_format.erl @@ -279,13 +279,22 @@ listener(#listener{node = Node, protocol = Protocol, {protocol, Protocol}, {ip_address, ip(IPAddress)}, {port, Port}, - {socket_opts, format_socket_opts(Opts)}]. + {socket_opts, format_socket_opts(Opts)}, + {ssl, is_ssl_socket(Opts)} + ]. web_context(Props0) -> SslOpts = pget(ssl_opts, Props0, []), Props = proplists:delete(ssl_opts, Props0), [{ssl_opts, format_socket_opts(SslOpts)} | Props]. +is_ssl_socket(Opts) -> + S = proplists:get_value(socket_opts, Opts, Opts), + (proplists:get_value(ssl_opts, S, undefined) =/= undefined) orelse + (proplists:get_value(cacertfile, S, undefined) =/= undefined) orelse + (proplists:get_value(certfile, S, undefined) =/= undefined) orelse + (proplists:get_value(keyfile, S, undefined) =/= undefined). + format_socket_opts(Opts) -> format_socket_opts(Opts, []).