mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-03 05:07:42 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

core.configmanager: Rename Secret to Credential

Browse source 
To match the variable name and what systemd calls them.
This commit is contained in:
Kim Alvefur 2025-01-18 12:31:48 +01:00
parent 41a360ce2a
commit 059d6457e0
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
core/configmanager.lua
View file

@ -199,6 +199,7 @@ do
FileLine = true, FileLine = true,
FileLines = true, FileLines = true,
Secret = true, Secret = true,
Credential = true,
Include = true, include = true, RunScript = true }, { Include = true, include = true, RunScript = true }, {
__index = function (_, k) __index = function (_, k)
if k:match("^ENV_") then if k:match("^ENV_") then
@ -361,17 +362,18 @@ do
env.FileLines = linereader(config_path); env.FileLines = linereader(config_path);
if _G.prosody.paths.secrets then 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 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 else
env.Secret = function() env.Credential = function()
t_insert(warnings, ("%s:%d: Secret() requires the $CREDENTIALS_DIRECTORY environment variable to be set") t_insert(warnings, ("%s:%d: Credential() requires the $CREDENTIALS_DIRECTORY environment variable to be set")
:format(config_file, get_line_number(config_file))); :format(config_file, get_line_number(config_file)));
return nil; return nil;
end end
end end
env.Secret = env.Credential; -- COMPAT remove after all the early adopters s/Secret/Credential/
local chunk, err = envload(data, "@"..config_file, env); local chunk, err = envload(data, "@"..config_file, env);