aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2009-03-30 20:04:31 +0100
committerMatthew Wild <mwild1@gmail.com>2009-03-30 20:04:31 +0100
commit058336cefc0e1954bb3a9982b8c574bace2dbe76 (patch)
tree075cbafe89efc4c3e8ecbda4dab446ce076325f6
parent1dce551e58db0d49857d6ace87793259fc0aaeec (diff)
parent27d6ab1bf5447e6765896cea787a47d7312e780c (diff)
downloadprosody-058336cefc0e1954bb3a9982b8c574bace2dbe76.tar.gz
prosody-058336cefc0e1954bb3a9982b8c574bace2dbe76.zip
Automated merge with ssh://hg@prosody.im/prosody-hg
-rwxr-xr-xprosody12
1 files changed, 5 insertions, 7 deletions
diff --git a/prosody b/prosody
index f411651f..57e705ce 100755
--- a/prosody
+++ b/prosody
@@ -110,9 +110,13 @@ end);
----------- 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)
@@ -147,12 +151,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;