From 8a41a4ee0097cd434bc117e0dfeb528d1af06aa0 Mon Sep 17 00:00:00 2001 From: Zaiming Shi Date: Mon, 22 Mar 2021 16:27:05 +0100 Subject: [PATCH] fix(ssl): Fix dir name for uploaded certificates The dir is "rules" not "rule" in the original code ref: https://github.com/emqx/emqx-rule-actions/blob/f1eba1c648af950f9cbb3765c28d4b9f16086857/src/emqx_rule_actions_utils.erl --- apps/emqx_bridge_mqtt/src/emqx_bridge_mqtt_actions.erl | 2 +- apps/emqx_web_hook/src/emqx_web_hook_actions.erl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/emqx_bridge_mqtt/src/emqx_bridge_mqtt_actions.erl b/apps/emqx_bridge_mqtt/src/emqx_bridge_mqtt_actions.erl index cbd7f28ed..1752de8e2 100644 --- a/apps/emqx_bridge_mqtt/src/emqx_bridge_mqtt_actions.erl +++ b/apps/emqx_bridge_mqtt/src/emqx_bridge_mqtt_actions.erl @@ -567,7 +567,7 @@ options(Options, PoolName, ResId) -> maybe_ssl(_Options, false, _ResId) -> []; maybe_ssl(Options, true, ResId) -> - Dir = filename:join([emqx:get_env(data_dir), "rule", ResId]), + Dir = filename:join([emqx:get_env(data_dir), "rules", ResId]), [{ssl, true}, {ssl_opts, emqx_plugin_libs_ssl:save_files_return_opts(Options, Dir)}]. mqtt_ver(ProtoVer) -> diff --git a/apps/emqx_web_hook/src/emqx_web_hook_actions.erl b/apps/emqx_web_hook/src/emqx_web_hook_actions.erl index 4e63b54df..2d7fe8801 100644 --- a/apps/emqx_web_hook/src/emqx_web_hook_actions.erl +++ b/apps/emqx_web_hook/src/emqx_web_hook_actions.erl @@ -346,7 +346,7 @@ pool_name(ResId) -> list_to_atom("webhook:" ++ str(ResId)). get_ssl_opts(Opts, ResId) -> - Dir = filename:join([emqx:get_env(data_dir), "rule", ResId]), + Dir = filename:join([emqx:get_env(data_dir), "rules", ResId]), [{ssl, true}, {ssl_opts, emqx_plugin_libs_ssl:save_files_return_opts(Opts, Dir)}]. parse_host(Host) ->