equal
deleted
inserted
replaced
72 if CFG_CONFIGDIR then |
72 if CFG_CONFIGDIR then |
73 table.insert(filenames, CFG_CONFIGDIR.."/"..arg[2]); |
73 table.insert(filenames, CFG_CONFIGDIR.."/"..arg[2]); |
74 end |
74 end |
75 table.remove(arg, 1); table.remove(arg, 1); |
75 table.remove(arg, 1); table.remove(arg, 1); |
76 else |
76 else |
77 for _, format in ipairs(config.parsers()) do |
77 table.insert(filenames, (CFG_CONFIGDIR or ".").."/prosody.cfg.lua"); |
78 table.insert(filenames, (CFG_CONFIGDIR or ".").."/prosody.cfg."..format); |
|
79 end |
|
80 end |
78 end |
81 for _,_filename in ipairs(filenames) do |
79 for _,_filename in ipairs(filenames) do |
82 filename = _filename; |
80 filename = _filename; |
83 local file = io.open(filename); |
81 local file = io.open(filename); |
84 if file then |
82 if file then |