diff options
author | Waqas Hussain <waqas20@gmail.com> | 2013-01-22 08:30:38 +0500 |
---|---|---|
committer | Waqas Hussain <waqas20@gmail.com> | 2013-01-22 08:30:38 +0500 |
commit | 8c8ebcc4aeb65184408557a5d3f967dd2b0e7e51 (patch) | |
tree | 9938dd9411cf02b2c7cc7a82103633f7378030b8 /prosody | |
parent | f9b9d6c4d2b71e142bc7cd254bc91171e32b2825 (diff) | |
parent | 4808daf39fd7b3d3de0e2c25e871dcbacbed1299 (diff) | |
download | prosody-8c8ebcc4aeb65184408557a5d3f967dd2b0e7e51.tar.gz prosody-8c8ebcc4aeb65184408557a5d3f967dd2b0e7e51.zip |
Merge 0.9->trunk
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); |