diff options
| -rw-r--r-- | core/configmanager.lua | 6 | ||||
| -rw-r--r-- | util/startup.lua | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/core/configmanager.lua b/core/configmanager.lua index 1da50ae5..36df0171 100644 --- a/core/configmanager.lua +++ b/core/configmanager.lua @@ -198,7 +198,6 @@ do FileContents = true, FileLine = true, FileLines = true, - Secret = true, Credential = true, Include = true, include = true, RunScript = true }, { __index = function (_, k) @@ -361,8 +360,8 @@ do env.FileLine = filereader(config_path, "*l"); env.FileLines = linereader(config_path); - if _G.prosody.paths.secrets then - env.Credential = filereader(_G.prosody.paths.secrets, "*a"); + if _G.prosody.paths.credentials then + env.Credential = filereader(_G.prosody.paths.credentials, "*a"); elseif _G.prosody.process_type == "prosody" then env.Credential = function() error("Credential() requires the $CREDENTIALS_DIRECTORY environment variable to be set", 2) end else @@ -373,7 +372,6 @@ do end end - env.Secret = env.Credential; -- COMPAT remove after all the early adopters s/Secret/Credential/ local chunk, err = envload(data, "@"..config_file, env); diff --git a/util/startup.lua b/util/startup.lua index 1557ab0f..c54fa56d 100644 --- a/util/startup.lua +++ b/util/startup.lua @@ -271,7 +271,7 @@ function startup.init_global_state() config = CFG_CONFIGDIR or "."; plugins = CFG_PLUGINDIR or "plugins"; data = "data"; - secrets = os.getenv("CREDENTIALS_DIRECTORY"); + credentials = os.getenv("CREDENTIALS_DIRECTORY"); }; prosody.arg = _G.arg; |