# HG changeset patch # User Matthew Wild # Date 1263020628 0 # Node ID 3ba9db4b93114619e6f91c1edab5352d916b3eed # Parent 343a9eb7540e738d41ca156a0c4c7dade9daf490 prosody: Read list of possible config extensions from configmanager, removes old TODO diff -r 343a9eb7540e -r 3ba9db4b9311 prosody --- a/prosody Sat Jan 09 06:59:47 2010 +0000 +++ b/prosody Sat Jan 09 07:03:48 2010 +0000 @@ -64,8 +64,6 @@ -- 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 +73,9 @@ 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;