X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=prosody;h=6df7428b51c90498c054e7ab27057c0b898a3d0b;hb=489f9a61fad282920ab981ad6a3c94526bfe36b3;hp=e22e59454ab3070649284db4fe938bc2bb49e610;hpb=c435d0bd7afd6d625a5073cc35a2cc9500bdaf21;p=prosody.git

diff --git a/prosody b/prosody
index e22e5945..6df7428b 100755
--- a/prosody
+++ b/prosody
@@ -14,7 +14,7 @@ CFG_CONFIGDIR=os.getenv("PROSODY_CFGDIR");
 CFG_PLUGINDIR=os.getenv("PROSODY_PLUGINDIR");
 CFG_DATADIR=os.getenv("PROSODY_DATADIR");
 
--- -- -- -- -- -- -- ---- -- -- -- -- -- -- -- --
+-- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
 
 if CFG_SOURCEDIR then
 	package.path = CFG_SOURCEDIR.."/?.lua;"..package.path;
@@ -58,7 +58,27 @@ config = require "core.configmanager"
 function read_config()
 	-- TODO: Check for other formats when we add support for them
 	-- Use lfs? Make a new conf/ dir?
-	local ok, level, err = config.load((CFG_CONFIGDIR or ".").."/prosody.cfg.lua");
+	local filenames = {};
+	
+	local filename;
+	if arg[1] == "--config" and arg[2] then
+		table.insert(filenames, arg[2]);
+		if CFG_CONFIGDIR then
+			table.insert(filenames, CFG_CONFIGDIR.."/"..arg[2]);
+		end
+	else
+		table.insert(filenames, (CFG_CONFIGDIR or ".").."/prosody.cfg.lua");
+	end
+	for _,_filename in ipairs(filenames) do
+		filename = _filename;
+		local file = io.open(filename);
+		if file then
+			file:close();
+			CFG_CONFIGDIR = filename:match("^(.*)[\\/][^\\/]*$");
+			break;
+		end
+	end
+	local ok, level, err = config.load(filename);
 	if not ok then
 		print("\n");
 		print("**************************");
@@ -82,13 +102,13 @@ function read_config()
 end
 
 function load_libraries()
-	--- Initialize logging
+	-- Initialize logging
 	require "core.loggingmanager"
 	
-	--- Check runtime dependencies
+	-- Check runtime dependencies
 	require "util.dependencies"
 	
-	--- Load socket framework
+	-- Load socket framework
 	server = require "net.server"
 end	
 
@@ -153,6 +173,41 @@ function init_global_state()
 		prosody.events.fire_event("server-stopping", {reason = reason});
 		server.setquitting(true);
 	end
+
+	-- Load SSL settings from config, and create a ctx table
+	local global_ssl_ctx = rawget(_G, "ssl") and config.get("*", "core", "ssl");
+	if global_ssl_ctx then
+		local default_ssl_ctx = { mode = "server", protocol = "sslv23", capath = "/etc/ssl/certs", verify = "none", options = "no_sslv2"; };
+		setmetatable(global_ssl_ctx, { __index = default_ssl_ctx });
+		prosody.global_ssl_ctx = global_ssl_ctx;
+	end
+
+	local cl = require "net.connlisteners";
+	function prosody.net_activate_ports(option, listener, default, conntype)
+		conntype = conntype or (global_ssl_ctx and "tls") or "tcp";
+		if not cl.get(listener) then return; end
+		local ports = config.get("*", "core", option.."_ports") or default;
+		if type(ports) == "number" then ports = {ports} end;
+		
+		if type(ports) ~= "table" then
+			log("error", "core."..option.." is not a table");
+		else
+			for _, port in ipairs(ports) do
+				if type(port) ~= "number" then
+					log("error", "Non-numeric "..option.."_ports: "..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 
+							or config.get("*", "core", "interface"),
+						type = conntype
+					});
+				end
+			end
+		end
+	end
 end
 
 function read_version()
@@ -220,45 +275,11 @@ function prepare_to_start()
 	eventmanager.fire_event("server-starting");
 	prosody.events.fire_event("server-starting");
 
-	-- Load SSL settings from config, and create a ctx table
-	local global_ssl_ctx = rawget(_G, "ssl") and config.get("*", "core", "ssl");
-	if global_ssl_ctx then
-		local default_ssl_ctx = { mode = "server", protocol = "sslv23", capath = "/etc/ssl/certs", verify = "none"; };
-		setmetatable(global_ssl_ctx, { __index = default_ssl_ctx });
-	end
-
-	local cl = require "net.connlisteners";
 	-- start listening on sockets
-	function prosody.net_activate_ports(option, listener, default, conntype)
-		if not cl.get(listener) then return; end
-		local ports = config.get("*", "core", option.."_ports") or default;
-		if type(ports) == "number" then ports = {ports} end;
-		
-		if type(ports) ~= "table" then
-			log("error", "core."..option.." is not a table");
-		else
-			for _, port in ipairs(ports) do
-				if type(port) ~= "number" then
-					log("error", "Non-numeric "..option.."_ports: "..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 
-							or config.get("*", "core", "interface"),
-						type = conntype
-					});
-				end
-			end
-		end
-	end
-
-	prosody.net_activate_ports("c2s", "xmppclient", {5222}, (global_ssl_ctx and "tls") or "tcp");
-	prosody.net_activate_ports("s2s", "xmppserver", {5269}, (global_ssl_ctx and "tls") or "tcp");
+	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("legacy_ssl", "xmppclient", {}, "ssl");
-	prosody.net_activate_ports("console", "console", {5582}, "tcp");
 
 	prosody.start_time = os.time();
 end	
@@ -282,7 +303,7 @@ end
 function loop()
 	-- Error handler for errors that make it this far
 	local function catch_uncaught_error(err)
-		if type(err) == "string" and err:match("%d*: interrupted!$") then
+		if type(err) == "string" and err:match("interrupted!$") then
 			return "quitting";
 		end