Software / code / prosody
Changeset
940:776cb8c847c5
Move SSL initialisation into the correct spot (thanks albert)
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Mon, 30 Mar 2009 20:04:11 +0100 |
| parents | 922:0e45234360cd |
| children | 941:13ebec89b568 |
| files | prosody |
| diffstat | 1 files changed, 5 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/prosody Sun Mar 29 13:50:59 2009 +0100 +++ b/prosody Mon Mar 30 20:04:11 2009 +0100 @@ -107,9 +107,13 @@ ----------- 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 @@ -- 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;
