util.jid: Add join(node, host, resource) function to join the components and return...

[prosody.git] / prosody

diff --git a/prosody b/prosody
index 8dd37f30f6ada3bbfc5dcc4f50a62abbb7f81b09..7f69e085bdcb8408536b9961fdab455e5f92b3a3 100755 (executable)
--- a/prosody
+++ b/prosody
@@ -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("**************************");