aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorWaqas Hussain <waqas20@gmail.com>2009-11-23 21:49:20 +0500
committerWaqas Hussain <waqas20@gmail.com>2009-11-23 21:49:20 +0500
commit646176d19f2024c6bee3f0a4922ee054e36961bb (patch)
treef705893152518f1bf76088d11fab4495687cacd5 /prosody
parent53979a7de7baea48ede8b2a45a58127ac645d86b (diff)
parent7b44078ada9106c282c5ba41a75728b45ac6a65e (diff)
downloadprosody-646176d19f2024c6bee3f0a4922ee054e36961bb.tar.gz
prosody-646176d19f2024c6bee3f0a4922ee054e36961bb.zip
Merged with 0.6.
Diffstat (limited to 'prosody')
-rwxr-xr-xprosody22
1 files changed, 21 insertions, 1 deletions
diff --git a/prosody b/prosody
index 8dd37f30..7f69e085 100755
--- 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("**************************");