aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorEmmanuel Gil Peyrot <linkmauve@linkmauve.fr>2017-05-27 15:32:28 +0100
committerEmmanuel Gil Peyrot <linkmauve@linkmauve.fr>2017-05-27 15:32:28 +0100
commit240b0bb53ec6286c5cdce7d8ca10af514a00bb0f (patch)
treef5b4a772f168579dbf6e0ad85dde50bd9942661f /prosody
parent31449a33114f4c183969bfca6e7572ac481bc35a (diff)
downloadprosody-240b0bb53ec6286c5cdce7d8ca10af514a00bb0f.tar.gz
prosody-240b0bb53ec6286c5cdce7d8ca10af514a00bb0f.zip
configmanager: Remove support for multiple parsers, fixes #852.
Diffstat (limited to 'prosody')
-rwxr-xr-xprosody4
1 files changed, 1 insertions, 3 deletions
diff --git a/prosody b/prosody
index 7a0d3552..7f6b1c2d 100755
--- a/prosody
+++ b/prosody
@@ -76,9 +76,7 @@ function read_config()
elseif os.getenv("PROSODY_CONFIG") then -- Passed by prosodyctl
table.insert(filenames, os.getenv("PROSODY_CONFIG"));
else
- for _, format in ipairs(config.parsers()) do
- table.insert(filenames, (CFG_CONFIGDIR or ".").."/prosody.cfg."..format);
- end
+ table.insert(filenames, (CFG_CONFIGDIR or ".").."/prosody.cfg.lua");
end
for _,_filename in ipairs(filenames) do
filename = _filename;