mod_tls: Let hosts without an 'ssl' option inherit it from their parent hosts.

[prosody.git] / plugins / mod_motd.lua

diff --git a/plugins/mod_motd.lua b/plugins/mod_motd.lua
index 500b4a4612f6847b059e38623e4f6bf255ce19d8..f323e606e50af903220d0fb105d83e415035ccfb 100644 (file)
--- a/plugins/mod_motd.lua
+++ b/plugins/mod_motd.lua
@@ -9,6 +9,7 @@
 
 local host = module:get_host();
 local motd_text = module:get_option("motd_text") or "MOTD: (blank)";
+local motd_jid = module:get_option("motd_jid") or host;
 
 local st = require "util.stanza";
 
@@ -16,7 +17,7 @@ module:hook("resource-bind",
        function (event)
                local session = event.session;
                local motd_stanza =
-                       st.message({ to = session.username..'@'..session.host, from = host })
+                       st.message({ to = session.username..'@'..session.host, from = motd_jid })
                                :tag("body"):text(motd_text);
                core_route_stanza(hosts[host], motd_stanza);
                module:log("debug", "MOTD send to user %s@%s", session.username, session.host);