From 27d6ab1bf5447e6765896cea787a47d7312e780c Mon Sep 17 00:00:00 2001
From: Matthew Wild <mwild1@gmail.com>
Date: Mon, 30 Mar 2009 20:04:11 +0100
Subject: Move SSL initialisation into the correct spot (thanks albert)
---
prosody | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
(limited to 'prosody')
diff --git a/prosody b/prosody
index 06ea5837..59ff904f 100755
--- a/prosody
+++ b/prosody
@@ -107,9 +107,13 @@ require "util.datamanager".set_data_path(data_path);
----------- End of out-of-place code --------------
-
eventmanager.fire_event("server-starting");
+local global_ssl_ctx = config.get("*", "core", "ssl");
+if global_ssl_ctx then
+ local default_ssl_ctx = { mode = "server", protocol = "sslv23", capath = "/etc/ssl/certs", verify = "none"; };
+ setmetatable(global_ssl_ctx, { __index = default_ssl_ctx });
+end
-- start listening on sockets
function net_activate_ports(option, listener, default, conntype)
@@ -144,12 +148,6 @@ end
-- setup error handling
setmetatable(_G, { __index = function (t, k) error("Attempt to read a non-existent global '"..k.."'", 2); end, __newindex = function (t, k, v) error("Attempt to set a global: "..tostring(k).." = "..tostring(v), 2); end });
-local global_ssl_ctx = config.get("*", "core", "ssl");
-if global_ssl_ctx then
- local default_ssl_ctx = { mode = "server", protocol = "sslv23", capath = "/etc/ssl/certs", verify = "none"; };
- setmetatable(global_ssl_ctx, { __index = default_ssl_ctx });
-end
-
eventmanager.fire_event("server-started");
local quitting;
--
cgit v1.2.3