yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #11702 from zmstone/0928-minor-chore 

0928 minor chore
This commit is contained in:
Zaiming (Stone) Shi 2023-09-28 12:39:55 +02:00 committed by GitHub
parent 0a89712b8a b14425d865
commit 98409c9b1e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/emqx/etc/ssl_dist.conf
View File

@ -1,6 +1,6 @@
%% This additional config file is used when the config 'cluster.proto_dist' in emqx.conf is set to 'inet_tls'. %% This additional config file is used when the config 'cluster.proto_dist' in emqx.conf is set to 'inet_tls'.
%% Which means the EMQX nodes will connect to each other over TLS. %% Which means the EMQX nodes will connect to each other over TLS.
%% For more information about inter-broker security, see: https://docs.emqx.com/en/enterprise/v5.0/deploy/cluster/security.html %% For more information about inter-broker security, see: https://docs.emqx.com/en/enterprise/v5.3/deploy/cluster/security.html
%% For more information in technical details see: http://erlang.org/doc/apps/ssl/ssl_distribution.html %% For more information in technical details see: http://erlang.org/doc/apps/ssl/ssl_distribution.html

2
apps/emqx_dashboard_sso/src/emqx_dashboard_sso_saml_api.erl
View File

@ -85,7 +85,7 @@ sp_saml_metadata(get, _Req) ->
#{enable := true, sp := SP} = _State -> #{enable := true, sp := SP} = _State ->
SignedXml = esaml_sp:generate_metadata(SP), SignedXml = esaml_sp:generate_metadata(SP),
Metadata = xmerl:export([SignedXml], xmerl_xml), Metadata = xmerl:export([SignedXml], xmerl_xml),
{200, #{<<"Content-Type">> => <<"text/xml">>}, erlang:iolist_to_binary(Metadata)}; {200, #{<<"content-type">> => <<"text/xml">>}, erlang:iolist_to_binary(Metadata)};
_ -> _ ->
{404, #{code => ?BACKEND_NOT_FOUND, message => <<"Backend not found">>}} {404, #{code => ?BACKEND_NOT_FOUND, message => <<"Backend not found">>}}
end. end.

2
dev
View File

@ -416,7 +416,7 @@ boot() {
gen_tmp_node_name() { gen_tmp_node_name() {
local rnd local rnd
rnd="$(od -t u -N 4 /dev/urandom | head -n1 | awk '{print $2 % 1000}')" rnd="$(od -t u -N 4 /dev/urandom | head -n1 | awk '{print $2 % 1000}')"
echo "remsh${rnd}-$EMQX_NODE_NAME}" echo "remsh${rnd}-${EMQX_NODE_NAME}"
} }
remsh() { remsh() {