Mercurial > prosody-hg

diff prosody @ 5296:78b7a4ad2f32

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
prosodyctl, prosody: Pass the selected config file from prosodyctl to prosody
author Kim Alvefur <zash@zash.se>
date Wed, 09 Jan 2013 22:01:52 +0100
parents 815c689f85ad
children ac530c44772e
line wrap: on
line diff
--- a/prosody	Wed Jan 09 20:40:44 2013 +0100
+++ b/prosody	Wed Jan 09 22:01:52 2013 +0100
@@ -70,6 +70,8 @@
 		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);