aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2010-02-13 16:21:32 +0000
committerMatthew Wild <mwild1@gmail.com>2010-02-13 16:21:32 +0000
commitc311d42f9b1cef2ef255045585ffc348164783d8 (patch)
tree4a3d7fa9e3b8dec10bab97bced7ac1dc16640762
parentbb996f5317b1df04976ee5927826ce20ced9a4f0 (diff)
downloadprosody-c311d42f9b1cef2ef255045585ffc348164783d8.tar.gz
prosody-c311d42f9b1cef2ef255045585ffc348164783d8.zip
prosody: Use certmanager to create the global SSL context
-rwxr-xr-xprosody9
1 files changed, 3 insertions, 6 deletions
diff --git a/prosody b/prosody
index df7ce9fb..2f60181e 100755
--- a/prosody
+++ b/prosody
@@ -186,12 +186,9 @@ function init_global_state()
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)