Software / code / prosody
Changeset
8162:a49c8930da3d
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Thu, 01 Jun 2017 14:05:58 +0200 |
| parents | 8158:b4cbd65ee4c5 (current diff) 8161:31938a0c398f (diff) |
| children | 8165:e564f13b9582 |
| files | |
| diffstat | 2 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/core/certmanager.lua Sun May 28 23:40:26 2017 +0200 +++ b/core/certmanager.lua Thu Jun 01 14:05:58 2017 +0200 @@ -216,6 +216,7 @@ 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
--- a/plugins/mod_welcome.lua Sun May 28 23:40:26 2017 +0200 +++ b/plugins/mod_welcome.lua Thu Jun 01 14:05:58 2017 +0200 @@ -14,8 +14,8 @@ 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);
