aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2010-01-09 07:03:48 +0000
committerMatthew Wild <mwild1@gmail.com>2010-01-09 07:03:48 +0000
commit45b07dd0faa477d52f5fba3cc9fcc5da2cb7b3b7 (patch)
tree8bd67c0fcf315228fa961babcb1ec33dde2fa85a
parent4da7be205c69218509f71c27308577a62fe04013 (diff)
downloadprosody-45b07dd0faa477d52f5fba3cc9fcc5da2cb7b3b7.tar.gz
prosody-45b07dd0faa477d52f5fba3cc9fcc5da2cb7b3b7.zip
prosody: Read list of possible config extensions from configmanager, removes old TODO
-rwxr-xr-xprosody6
1 files changed, 3 insertions, 3 deletions
diff --git a/prosody b/prosody
index 0577179f..dddfaacf 100755
--- a/prosody
+++ b/prosody
@@ -64,8 +64,6 @@ config = require "core.configmanager"
-- 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 @@ function read_config()
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;