aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2020-04-26 21:03:40 +0200
committerKim Alvefur <zash@zash.se>2020-04-26 21:03:40 +0200
commit47bd5544484dea585a4daa78d74197afcada3ff8 (patch)
tree9210aa321f1102a73f443d0d1fd7c013918f62a1
parent608f1d1c58ceac633a29036eb1a6b70103d2e0e0 (diff)
parent7c180434048c04edac669e2b6bb26eae0af68883 (diff)
downloadprosody-47bd5544484dea585a4daa78d74197afcada3ff8.tar.gz
prosody-47bd5544484dea585a4daa78d74197afcada3ff8.zip
Merge 0.11->trunk
-rw-r--r--plugins/mod_tls.lua8
1 files changed, 7 insertions, 1 deletions
diff --git a/plugins/mod_tls.lua b/plugins/mod_tls.lua
index b16acd09..151add6f 100644
--- a/plugins/mod_tls.lua
+++ b/plugins/mod_tls.lua
@@ -37,7 +37,7 @@ local ssl_ctx_c2s, ssl_ctx_s2sout, ssl_ctx_s2sin;
local ssl_cfg_c2s, ssl_cfg_s2sout, ssl_cfg_s2sin;
local err_c2s, err_s2sin, err_s2sout;
-function module.load()
+function module.load(reload)
local NULL = {};
local modhost = module.host;
local parent = modhost:match("%.(.*)$");
@@ -68,6 +68,12 @@ function module.load()
-- for incoming server connections
ssl_ctx_s2sin, err_s2sin, ssl_cfg_s2sin = create_context(host.host, "server", host_s2s, host_ssl, global_s2s, request_client_certs);
if not ssl_ctx_s2sin then module:log("error", "Error creating contexts for s2sin: %s", err_s2sin); end
+
+ if reload then
+ module:log("info", "Certificates reloaded");
+ else
+ module:log("info", "Certificates loaded");
+ end
end
module:hook_global("config-reloaded", module.load);