Mercurial > prosody-hg

comparison core/configmanager.lua @ 13630:8228f5094f7a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
util.startup: Rename credentials path variable too
author Kim Alvefur <zash@zash.se>
date Sat, 18 Jan 2025 13:29:59 +0100
parents 4fdd406564ea
children 0fe27632a837
comparison
equal deleted inserted replaced
13629:23aef73f0cb0 13630:8228f5094f7a
359 359
360 env.FileContents = filereader(config_path, "*a"); 360 env.FileContents = filereader(config_path, "*a");
361 env.FileLine = filereader(config_path, "*l"); 361 env.FileLine = filereader(config_path, "*l");
362 env.FileLines = linereader(config_path); 362 env.FileLines = linereader(config_path);
363 363
364 if _G.prosody.paths.secrets then 364 if _G.prosody.paths.credentials then
365 env.Credential = filereader(_G.prosody.paths.secrets, "*a"); 365 env.Credential = filereader(_G.prosody.paths.credentials, "*a");
366 elseif _G.prosody.process_type == "prosody" then 366 elseif _G.prosody.process_type == "prosody" then
367 env.Credential = function() error("Credential() requires the $CREDENTIALS_DIRECTORY environment variable to be set", 2) end 367 env.Credential = function() error("Credential() requires the $CREDENTIALS_DIRECTORY environment variable to be set", 2) end
368 else 368 else
369 env.Credential = function() 369 env.Credential = function()
370 t_insert(warnings, ("%s:%d: Credential() requires the $CREDENTIALS_DIRECTORY environment variable to be set") 370 t_insert(warnings, ("%s:%d: Credential() requires the $CREDENTIALS_DIRECTORY environment variable to be set")