# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1259007757 0
# Node ID 6f91d5348847a6007a93c9b4d61428e5da6be8d3
# Parent  0ef04962e112c31b277e9ce6480b5e1d4dda0d0d# Parent  bcc8f4bdb0e62508a6ad2ec29f2309e6dfa7f99a
Merge with trunk

diff -r 0ef04962e112 -r 6f91d5348847 prosody
--- a/prosody	Mon Nov 23 20:21:20 2009 +0000
+++ b/prosody	Mon Nov 23 20:22:37 2009 +0000
@@ -58,7 +58,27 @@
 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("**************************");