--- Required to be able to find packages installed with luarocks
-pcall(require, "luarocks.require");
+-- Check runtime dependencies
+if not require "util.dependencies".check_dependencies() then
+ os.exit(1);
+end
-- Replace require() with one that doesn't pollute _G, required
-- for neat sandboxing of modules
-- Replace require() with one that doesn't pollute _G, required
-- for neat sandboxing of modules
- table.insert(filenames, (CFG_CONFIGDIR or ".").."/prosody.cfg.lua");
+ for _, format in ipairs(config.parsers()) do
+ table.insert(filenames, (CFG_CONFIGDIR or ".").."/prosody.cfg."..format);
+ end
log("error", "core."..ports_option.." is not a table");
else
for _, port in ipairs(ports) do
log("error", "core."..ports_option.." is not a table");
else
for _, port in ipairs(ports) do
if type(port) ~= "number" then
log("error", "Non-numeric "..ports_option..": "..tostring(port));
else
cl.start(listener, {
ssl = conntype ~= "tcp" and global_ssl_ctx,
port = port,
if type(port) ~= "number" then
log("error", "Non-numeric "..ports_option..": "..tostring(port));
else
cl.start(listener, {
ssl = conntype ~= "tcp" and global_ssl_ctx,
port = port,
- interface = config.get("*", "core", option.."_interface")
- or cl.get(listener).default_interface
+ interface = (option and config.get("*", "core", option.."_interface"))
+ or cl.get(listener).default_interface
or config.get("*", "core", "interface"),
type = conntype
});
or config.get("*", "core", "interface"),
type = conntype
});
else
prosody.net_activate_ports("c2s", "xmppclient", {5222});
prosody.net_activate_ports("s2s", "xmppserver", {5269});
else
prosody.net_activate_ports("c2s", "xmppclient", {5222});
prosody.net_activate_ports("s2s", "xmppserver", {5269});
- prosody.net_activate_ports("component", "xmppcomponent", {}, "tcp");
+ prosody.net_activate_ports("component", "xmppcomponent", {5347}, "tcp");
prosody.net_activate_ports("legacy_ssl", "xmppclient", {}, "ssl");
end
prosody.net_activate_ports("legacy_ssl", "xmppclient", {}, "ssl");
end