X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=prosody;h=542787dfa6b91ddde5353a43edb479642bf5551e;hb=ac4a522812b793c32f013b0a67f35bd87fb32b0c;hp=6ff7743dff7411f3a8ef498ed38b278a25a365be;hpb=e97186e1a338eb9f399de3bf9add9412aa1565bc;p=prosody.git

diff --git a/prosody b/prosody
index 6ff7743d..542787df 100755
--- a/prosody
+++ b/prosody
@@ -32,8 +32,10 @@ if CFG_DATADIR then
 	end
 end
 
--- 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
@@ -64,8 +66,6 @@ config = require "core.configmanager"
 -- functions get called
 
 function read_config()
-	-- TODO: Check for other formats when we add support for them
-	-- Use lfs? Make a new conf/ dir?
 	local filenames = {};
 	
 	local filename;
@@ -75,7 +75,9 @@ function read_config()
 			table.insert(filenames, CFG_CONFIGDIR.."/"..arg[2]);
 		end
 	else
-		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
 	end
 	for _,_filename in ipairs(filenames) do
 		filename = _filename;
@@ -113,9 +115,6 @@ function load_libraries()
 	-- Initialize logging
 	require "core.loggingmanager"
 	
-	-- Check runtime dependencies
-	require "util.dependencies"
-	
 	-- Load socket framework
 	server = require "net.server"
 end	
@@ -202,14 +201,15 @@ function init_global_state()
 			log("error", "core."..ports_option.." is not a table");
 		else
 			for _, port in ipairs(ports) do
+				port = tonumber(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
 					});
@@ -294,7 +294,7 @@ function prepare_to_start()
 	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