Changeset

2632:a461c682f67d

prosody: Use certmanager to create the global SSL context
author Matthew Wild <mwild1@gmail.com>
date Sat, 13 Feb 2010 16:21:32 +0000
parents 2631:77f135c7689a
children 2633:96db2eed2af9
files prosody
diffstat 1 files changed, 3 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/prosody	Sat Feb 13 16:12:53 2010 +0000
+++ b/prosody	Sat Feb 13 16:21:32 2010 +0000
@@ -186,12 +186,9 @@
 	end
 
 	-- Load SSL settings from config, and create a ctx table
-	local global_ssl_ctx = rawget(_G, "ssl") and config.get("*", "core", "ssl");
-	if global_ssl_ctx then
-		local default_ssl_ctx = { mode = "server", protocol = "sslv23", capath = "/etc/ssl/certs", verify = "none", options = "no_sslv2" };
-		setmetatable(global_ssl_ctx, { __index = default_ssl_ctx });
-		prosody.global_ssl_ctx = global_ssl_ctx;
-	end
+	local certmanager = require "core.certmanager";
+	local global_ssl_ctx = certmanager.create_context("*", "server");
+	prosody.global_ssl_ctx = global_ssl_ctx;
 
 	local cl = require "net.connlisteners";
 	function prosody.net_activate_ports(option, listener, default, conntype)