From ec9e9df9c7cb152c83fc3a2adf40228443cf1799 Mon Sep 17 00:00:00 2001 From: Emmanuel Gil Peyrot Date: Tue, 30 May 2017 20:52:22 +0100 Subject: mod_welcome: Return the pointer to the root of the stanza, fixes a bug similar to #922. --- plugins/mod_welcome.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/mod_welcome.lua b/plugins/mod_welcome.lua index e498f0b3..c4ebaf30 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); -- cgit v1.2.3 From f65858dd27db2c7d20d80d962e6b4b7ca2858374 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Thu, 1 Jun 2017 14:03:50 +0200 Subject: certmanager: Update the 'certificates' option after the config has been reloaded (fixes #929) --- core/certmanager.lua | 1 + 1 file changed, 1 insertion(+) 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 -- cgit v1.2.3