diff options
| author | Kim Alvefur <zash@zash.se> | 2017-06-01 14:05:58 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2017-06-01 14:05:58 +0200 |
| commit | 7586690f44817e61f5a0ef8974a7bdba38d86028 (patch) | |
| tree | 241ce473feccaef38dcf409ebac3d60868fc6a72 | |
| parent | f176688ed175d5e8768b3232a9d934f9a380bd61 (diff) | |
| parent | 3c37921b044842e3c1e73cea3ac9be6bbcf997ed (diff) | |
| download | prosody-7586690f44817e61f5a0ef8974a7bdba38d86028.tar.gz prosody-7586690f44817e61f5a0ef8974a7bdba38d86028.zip | |
Merge 0.10->trunk
| -rw-r--r-- | core/certmanager.lua | 1 | ||||
| -rw-r--r-- | plugins/mod_welcome.lua | 4 |
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); |