aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2013-01-09 22:01:52 +0100
committerKim Alvefur <zash@zash.se>2013-01-09 22:01:52 +0100
commit79a96e236c927803a943e2d38a2bb7ac7410d065 (patch)
tree78b78b36a878d1348f2386435302070abaa91127 /prosody
parentprosodyctl: Pop arg items after use. Fixes #306 (diff)
downloadprosody-79a96e236c927803a943e2d38a2bb7ac7410d065.tar.xz
prosody-79a96e236c927803a943e2d38a2bb7ac7410d065.zip
prosodyctl, prosody: Pass the selected config file from prosodyctl to prosody
Diffstat (limited to 'prosody')
-rwxr-xr-xprosody2
1 files changed, 2 insertions, 0 deletions
diff --git a/prosody b/prosody
index da77719da..00fde04cd 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);