From 45b07dd0faa477d52f5fba3cc9fcc5da2cb7b3b7 Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Sat, 9 Jan 2010 07:03:48 +0000 Subject: prosody: Read list of possible config extensions from configmanager, removes old TODO --- prosody | 6 +++--- 1 file 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; -- cgit v1.2.3