aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--core/certmanager.lua1
-rw-r--r--plugins/mod_welcome.lua4
2 files changed, 3 insertions, 2 deletions
diff --git a/core/certmanager.lua b/core/certmanager.lua
index 12ae94b1..2e237595 100644
--- a/core/certmanager.lua
+++ b/core/certmanager.lua
@@ -216,6 +216,7 @@ end
local function reload_ssl_config()
global_ssl_config = configmanager.get("*", "ssl");
+ global_certificates = configmanager.get("*", "certificates") or "certs";
if luasec_has.no_compression then
core_defaults.options.no_compression = configmanager.get("*", "ssl_compression") ~= true;
end
diff --git a/plugins/mod_welcome.lua b/plugins/mod_welcome.lua
index d74643de..f6b13df5 100644
--- a/plugins/mod_welcome.lua
+++ b/plugins/mod_welcome.lua
@@ -14,8 +14,8 @@ local st = require "util.stanza";
module:hook("user-registered",
function (user)
local welcome_stanza =
- st.message({ to = user.username.."@"..user.host, from = host })
- :tag("body"):text(welcome_text:gsub("$(%w+)", user));
+ st.message({ to = user.username.."@"..user.host, from = host },
+ welcome_text:gsub("$(%w+)", user));
module:send(welcome_stanza);
module:log("debug", "Welcomed user %s@%s", user.username, user.host);
end);