configmanager: Add parsers() method to return an array of supported config formats

[prosody.git] / core / hostmanager.lua

diff --git a/core/hostmanager.lua b/core/hostmanager.lua
index f89eaebab0737bd70543e21cef6dcd936c2d57b2..b3493e6736711e0147c93391609060db49f775a2 100644 (file)
--- a/core/hostmanager.lua
+++ b/core/hostmanager.lua
@@ -14,14 +14,16 @@ local eventmanager = require "core.eventmanager";
 local modulemanager = require "core.modulemanager";
 local events_new = require "util.events".new;
 
+local uuid_gen = require "util.uuid".generate;
+
 if not _G.prosody.incoming_s2s then
        require "core.s2smanager";
 end
 local incoming_s2s = _G.prosody.incoming_s2s;
 
 -- These are the defaults if not overridden in the config
-local default_ssl_ctx = { mode = "client", protocol = "sslv23", capath = "/etc/ssl/certs", verify = "none"; };
-local default_ssl_ctx_in = { mode = "server", protocol = "sslv23", capath = "/etc/ssl/certs", verify = "none"; };
+local default_ssl_ctx = { mode = "client", protocol = "sslv23", capath = "/etc/ssl/certs", verify = "none", options = "no_sslv2"; };
+local default_ssl_ctx_in = { mode = "server", protocol = "sslv23", capath = "/etc/ssl/certs", verify = "none", options = "no_sslv2"; };
 
 local log = require "util.logger".init("hostmanager");
 
@@ -47,10 +49,11 @@ eventmanager.add_event_hook("server-starting", load_enabled_hosts);
 
 function activate(host, host_config)
        hosts[host] = {type = "local", connected = true, sessions = {}, 
-                      host = host, s2sout = {}, events = events_new(), 
-                      disallow_s2s = configmanager.get(host, "core", "disallow_s2s") 
-                        or (configmanager.get(host, "core", "anonymous_login") 
-                            and (configmanager.get(host, "core", "disallow_s2s") ~= false))
+                       host = host, s2sout = {}, events = events_new(), 
+                       disallow_s2s = configmanager.get(host, "core", "disallow_s2s") 
+                               or (configmanager.get(host, "core", "anonymous_login") 
+                               and (configmanager.get(host, "core", "disallow_s2s") ~= false));
+                       dialback_secret = configmanager.get(host, "core", "dialback_secret") or uuid_gen();
                      };
        for option_name in pairs(host_config.core) do
                if option_name:match("_ports$") then