diff options
author | 2013-01-09 22:01:52 +0100 | |
---|---|---|
committer | 2013-01-09 22:01:52 +0100 | |
commit | 79a96e236c927803a943e2d38a2bb7ac7410d065 (patch) | |
tree | 78b78b36a878d1348f2386435302070abaa91127 /prosody | |
parent | prosodyctl: Pop arg items after use. Fixes #306 (diff) | |
download | prosody-79a96e236c927803a943e2d38a2bb7ac7410d065.tar.xz prosody-79a96e236c927803a943e2d38a2bb7ac7410d065.zip |
prosodyctl, prosody: Pass the selected config file from prosodyctl to prosody
Diffstat (limited to 'prosody')
-rwxr-xr-x | prosody | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -70,6 +70,8 @@ function read_config() if CFG_CONFIGDIR then table.insert(filenames, CFG_CONFIGDIR.."/"..arg[2]); end + 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); |