Software / code / prosody
Changeset
13628:4fdd406564ea
core.configmanager: Rename Secret to Credential
To match the variable name and what systemd calls them.
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sat, 18 Jan 2025 12:31:48 +0100 |
| parents | 13627:2db7b3b65363 |
| children | 13629:23aef73f0cb0 |
| files | core/configmanager.lua |
| diffstat | 1 files changed, 6 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/core/configmanager.lua Thu Jan 16 15:21:34 2025 +0100 +++ b/core/configmanager.lua Sat Jan 18 12:31:48 2025 +0100 @@ -199,6 +199,7 @@ FileLine = true, FileLines = true, Secret = true, + Credential = true, Include = true, include = true, RunScript = true }, { __index = function (_, k) if k:match("^ENV_") then @@ -361,17 +362,18 @@ env.FileLines = linereader(config_path); if _G.prosody.paths.secrets then - env.Secret = filereader(_G.prosody.paths.secrets, "*a"); + env.Credential = filereader(_G.prosody.paths.secrets, "*a"); elseif _G.prosody.process_type == "prosody" then - env.Secret = function() error("Secret() requires the $CREDENTIALS_DIRECTORY environment variable to be set", 2) end + env.Credential = function() error("Credential() requires the $CREDENTIALS_DIRECTORY environment variable to be set", 2) end else - env.Secret = function() - t_insert(warnings, ("%s:%d: Secret() requires the $CREDENTIALS_DIRECTORY environment variable to be set") + env.Credential = function() + t_insert(warnings, ("%s:%d: Credential() requires the $CREDENTIALS_DIRECTORY environment variable to be set") :format(config_file, get_line_number(config_file))); return nil; end end + env.Secret = env.Credential; -- COMPAT remove after all the early adopters s/Secret/Credential/ local chunk, err = envload(data, "@"..config_file, env);
