X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=plugins%2Fmod_tls.lua;h=c79227e1748bb673a278cb09d6a736afc6fafcab;hb=6a529b2e925a4bd641d5139af95d7cd36783b832;hp=fa7b4688dc66876499f92783caba475c8a297fe8;hpb=dc8ec173dae57af8b36462383757b02009bb122e;p=prosody.git

diff --git a/plugins/mod_tls.lua b/plugins/mod_tls.lua
index fa7b4688..c79227e1 100644
--- 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";
 
@@ -90,9 +91,14 @@ module:hook_stanza(xmlns_starttls, "proceed", function (session, stanza)
 end);
 
 function module.load()
-	local ssl_config = module:get_option("ssl");
-	host.ssl_ctx = create_context(host, "client", ssl_config); -- for outgoing connections
-	host.ssl_ctx_in = create_context(host, "server", ssl_config); -- for incoming connections
+	local global_ssl_config = config.get("*", "core", "ssl");
+	local ssl_config = config.get(module.host, "core", "ssl");
+	local base_host = module.host:match("%.(.*)");
+	if ssl_config == global_ssl_config and hosts[base_host] then
+		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
 
 function module.unload()