Let Google Hangouts contacts appear offline

[prosody.git] / plugins / mod_tls.lua

diff --git a/plugins/mod_tls.lua b/plugins/mod_tls.lua
index a80f230e527ade1658b1c8074c0de4a4a464b903..cace2d693efb530b26eadb633342aa101d55533c 100644 (file)
--- a/plugins/mod_tls.lua
+++ b/plugins/mod_tls.lua
@@ -6,6 +6,7 @@
 -- COPYING file in the source package for more information.
 --
 
+local config = require "core.configmanager";
 local create_context = require "core.certmanager".create_context;
 local st = require "util.stanza";
 
@@ -46,7 +47,7 @@ module:hook("stanza/urn:ietf:params:xml:ns:xmpp-tls:starttls", function(event)
                local host = origin.to_host or origin.host;
                local ssl_ctx = host and hosts[host].ssl_ctx_in or global_ssl_ctx;
                origin.conn:starttls(ssl_ctx);
-               origin.log("info", "TLS negotiation started for %s...", origin.type);
+               origin.log("debug", "TLS negotiation started for %s...", origin.type);
                origin.secure = false;
        else
                origin.log("warn", "Attempt to start TLS, but TLS is not available on this %s connection", origin.type);
@@ -90,7 +91,11 @@ module:hook_stanza(xmlns_starttls, "proceed", function (session, stanza)
 end);
 
 function module.load()
-       local ssl_config = module:get_option("ssl");
+       local ssl_config = config.rawget(module.host, "core", "ssl");
+       if not ssl_config then
+               local base_host = module.host:match("%.(.*)");
+               ssl_config = config.get(base_host, "core", "ssl");
+       end
        host.ssl_ctx = create_context(host.host, "client", ssl_config); -- for outgoing connections
        host.ssl_ctx_in = create_context(host.host, "server", ssl_config); -- for incoming connections
 end