diff options
author | Kim Alvefur <zash@zash.se> | 2013-01-09 22:01:52 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2013-01-09 22:01:52 +0100 |
commit | c29368d10341d818f98dceeaeb665419c760324d (patch) | |
tree | 78b78b36a878d1348f2386435302070abaa91127 /prosody | |
parent | 92c876088161f8f15c0b1f375df91baf267608dd (diff) | |
download | prosody-c29368d10341d818f98dceeaeb665419c760324d.tar.gz prosody-c29368d10341d818f98dceeaeb665419c760324d.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); |