aboutsummaryrefslogtreecommitdiffstats
path: root/core/configmanager.lua
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2018-09-03 17:45:30 +0100
committerMatthew Wild <mwild1@gmail.com>2018-09-03 17:45:30 +0100
commitc9cc5d4a6e469464596b18326bfeade3e48dc868 (patch)
tree8a7466b0cdec5d6cf108328144c9b37d790cacc7 /core/configmanager.lua
parentd78ccd8301f84e98d1887dd4ab08e5cd1cfa8964 (diff)
downloadprosody-c9cc5d4a6e469464596b18326bfeade3e48dc868.tar.gz
prosody-c9cc5d4a6e469464596b18326bfeade3e48dc868.zip
configmanager: Allow referencing environment variables in the config as as ENV_<name>
Diffstat (limited to 'core/configmanager.lua')
-rw-r--r--core/configmanager.lua7
1 files changed, 5 insertions, 2 deletions
diff --git a/core/configmanager.lua b/core/configmanager.lua
index d9482b81..1e67da9b 100644
--- a/core/configmanager.lua
+++ b/core/configmanager.lua
@@ -7,8 +7,8 @@
--
local _G = _G;
-local setmetatable, rawget, rawset, io, error, dofile, type, pairs =
- setmetatable, rawget, rawset, io, error, dofile, type, pairs;
+local setmetatable, rawget, rawset, io, os, error, dofile, type, pairs =
+ setmetatable, rawget, rawset, io, os, error, dofile, type, pairs;
local format, math_max = string.format, math.max;
local envload = require"util.envload".envload;
@@ -109,6 +109,9 @@ do
Component = true, component = true,
Include = true, include = true, RunScript = true }, {
__index = function (_, k)
+ if k:match("^ENV_") then
+ return os.getenv(k:sub(5));
+ end
return rawget(_G, k);
end,
__newindex = function (_, k, v)