diff options
| author | Matthew Wild <mwild1@gmail.com> | 2013-03-22 11:21:24 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2013-03-22 11:21:24 +0000 |
| commit | 515e80d5267ad5f0c830d754b8a856d850028132 (patch) | |
| tree | b2e13770bd92583a8854f1c07824a40cefeb7b14 /core/hostmanager.lua | |
| parent | c237eea8303441bc4cf5cd4f05eeb1d91d512b59 (diff) | |
| download | prosody-515e80d5267ad5f0c830d754b8a856d850028132.tar.gz prosody-515e80d5267ad5f0c830d754b8a856d850028132.zip | |
configmanager, hostmanager, prosody: Almost complete removal of section-related code, and the infamous 'core' section. Still backwards-compatible with API users.
Diffstat (limited to 'core/hostmanager.lua')
| -rw-r--r-- | core/hostmanager.lua | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/core/hostmanager.lua b/core/hostmanager.lua index 7c9298cd..52f494b5 100644 --- a/core/hostmanager.lua +++ b/core/hostmanager.lua @@ -37,8 +37,8 @@ local function load_enabled_hosts(config) local activated_any_host; for host, host_config in pairs(defined_hosts) do - if host ~= "*" and host_config.core.enabled ~= false then - if not host_config.core.component_module then + if host ~= "*" and host_config.enabled ~= false then + if not host_config.component_module then activated_any_host = true; end activate(host, host_config); @@ -78,7 +78,7 @@ function activate(host, host_config) send = host_send; modules = {}; }; - if not host_config.core.component_module then -- host + if not host_config.component_module then -- host host_session.type = "local"; host_session.sessions = {}; else -- component @@ -86,9 +86,9 @@ function activate(host, host_config) end hosts[host] = host_session; if not host:match("[@/]") then - disco_items:set(host:match("%.(.*)") or "*", host, host_config.core.name or true); + disco_items:set(host:match("%.(.*)") or "*", host, host_config.name or true); end - for option_name in pairs(host_config.core) do + for option_name in pairs(host_config) do if option_name:match("_ports$") or option_name:match("_interface$") then log("warn", "%s: Option '%s' has no effect for virtual hosts - put it in the server-wide section instead", host, option_name); end |