From 79a96e236c927803a943e2d38a2bb7ac7410d065 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Wed, 9 Jan 2013 22:01:52 +0100 Subject: prosodyctl, prosody: Pass the selected config file from prosodyctl to prosody --- prosody | 2 ++ 1 file changed, 2 insertions(+) (limited to 'prosody') diff --git a/prosody b/prosody index da77719d..00fde04c 100755 --- a/prosody +++ b/prosody @@ -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); -- cgit v1.2.3