From c111f3315c623ddee92d4d677b8305df3b855859 Mon Sep 17 00:00:00 2001 From: Michael Klishin Date: Sat, 26 Apr 2025 17:24:20 -0400 Subject: [PATCH] Naming #13809 (cherry picked from commit c9b2b7fb22a3e71a5eb88d4bff822cab743ee5ad) --- deps/rabbitmq_management/priv/www/js/tmpl/overview.ejs | 4 ++-- deps/rabbitmq_management_agent/src/rabbit_mgmt_format.erl | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/deps/rabbitmq_management/priv/www/js/tmpl/overview.ejs b/deps/rabbitmq_management/priv/www/js/tmpl/overview.ejs index 4d63c7fbd5..ac152cbfc6 100644 --- a/deps/rabbitmq_management/priv/www/js/tmpl/overview.ejs +++ b/deps/rabbitmq_management/priv/www/js/tmpl/overview.ejs @@ -252,7 +252,7 @@ <% } %> Bound to Port - SSL + TLS <% for (var i = 0; i < overview.listeners.length; i++) { @@ -265,7 +265,7 @@ <% } %> <%= listener.ip_address %> <%= listener.port %> - <%= fmt_boolean(listener.ssl || false) %> + <%= fmt_boolean(listener.tls || false) %> <% } %> diff --git a/deps/rabbitmq_management_agent/src/rabbit_mgmt_format.erl b/deps/rabbitmq_management_agent/src/rabbit_mgmt_format.erl index 620ed85dc6..b4e444e7d3 100644 --- a/deps/rabbitmq_management_agent/src/rabbit_mgmt_format.erl +++ b/deps/rabbitmq_management_agent/src/rabbit_mgmt_format.erl @@ -280,7 +280,7 @@ listener(#listener{node = Node, protocol = Protocol, {ip_address, ip(IPAddress)}, {port, Port}, {socket_opts, format_socket_opts(Opts)}, - {ssl, is_ssl_socket(Opts)} + {tls, has_tls_enabled(Opts)} ]. web_context(Props0) -> @@ -288,7 +288,7 @@ web_context(Props0) -> Props = proplists:delete(ssl_opts, Props0), [{ssl_opts, format_socket_opts(SslOpts)} | Props]. -is_ssl_socket(Opts) -> +has_tls_enabled(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