if CFG_CONFIGDIR then
table.insert(filenames, CFG_CONFIGDIR.."/"..arg[2]);
end
+ elseif os.getenv("PROSODY_CONFIG") then -- Passed by prosodyctl
+ table.insert(filenames, os.getenv("PROSODY_CONFIG"));
else
for _, format in ipairs(config.parsers()) do
table.insert(filenames, (CFG_CONFIGDIR or ".").."/prosody.cfg."..format);
function sanity_check()
for host, host_config in pairs(config.getconfig()) do
if host ~= "*"
- and host_config.core.enabled ~= false
- and not host_config.core.component_module then
+ and host_config.enabled ~= false
+ and not host_config.component_module then
return;
end
end
end
function init_global_state()
+ -- COMPAT: These globals are deprecated
bare_sessions = {};
full_sessions = {};
hosts = {};