prosody
fde53d82fde0
core/hostmanager.lua

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Comparison

core/hostmanager.lua @ 2985:fde53d82fde0

Merge 0.7->trunk (with MUC needing checking, waqas)
author Matthew Wild <mwild1@gmail.com>
date Tue, 04 May 2010 23:36:50 +0100
parent 2984:3094166cfdd5
child 3434:428f13c098d5
comparison
equal deleted inserted replaced
2975:c1a2e210f47e 2985:fde53d82fde0
40 activate(host, host_config); 40 activate(host, host_config);
41 end 41 end
42 end 42 end
43 43
44 if not activated_any_host then 44 if not activated_any_host then
45 log("error", "No hosts defined in the config file. This may cause unexpected behaviour as no modules will be loaded."); 45 log("error", "No active VirtualHost entries in the config file. This may cause unexpected behaviour as no modules will be loaded.");
46 end 46 end
47 47
48 eventmanager.fire_event("hosts-activated", defined_hosts); 48 eventmanager.fire_event("hosts-activated", defined_hosts);
49 hosts_loaded_once = true; 49 hosts_loaded_once = true;
50 end 50 end
58 or (configmanager.get(host, "core", "anonymous_login") 58 or (configmanager.get(host, "core", "anonymous_login")
59 and (configmanager.get(host, "core", "disallow_s2s") ~= false)); 59 and (configmanager.get(host, "core", "disallow_s2s") ~= false));
60 dialback_secret = configmanager.get(host, "core", "dialback_secret") or uuid_gen(); 60 dialback_secret = configmanager.get(host, "core", "dialback_secret") or uuid_gen();
61 }; 61 };
62 for option_name in pairs(host_config.core) do 62 for option_name in pairs(host_config.core) do
63 if option_name:match("_ports$") then 63 if option_name:match("_ports$") or option_name:match("_interface$") then
64 log("warn", "%s: Option '%s' has no effect for virtual hosts - put it in global Host \"*\" instead", host, option_name); 64 log("warn", "%s: Option '%s' has no effect for virtual hosts - put it in the server-wide section instead", host, option_name);
65 end 65 end
66 end 66 end
67 67
68 hosts[host].ssl_ctx = certmanager.create_context(host, "client", host_config); -- for outgoing connections 68 hosts[host].ssl_ctx = certmanager.create_context(host, "client", host_config); -- for outgoing connections
69 hosts[host].ssl_ctx_in = certmanager.create_context(host, "server", host_config); -- for incoming connections 69 hosts[host].ssl_ctx_in = certmanager.create_context(host, "server", host_config); -- for incoming connections