diff options
| author | Kim Alvefur <zash@zash.se> | 2025-01-18 13:29:59 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2025-01-18 13:29:59 +0100 |
| commit | 97884eb95690d276c763b97f3ad5202d5264db36 (patch) | |
| tree | 0db59ba0f68bd4fee34603ebbc06487fa597b378 | |
| parent | 9db7569abca727451aab83480a54644810318948 (diff) | |
| download | prosody-97884eb95690d276c763b97f3ad5202d5264db36.tar.gz prosody-97884eb95690d276c763b97f3ad5202d5264db36.zip | |
util.startup: Rename credentials path variable too
| -rw-r--r-- | core/configmanager.lua | 4 | ||||
| -rw-r--r-- | util/startup.lua | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/core/configmanager.lua b/core/configmanager.lua index 1da50ae5..60d9c85d 100644 --- a/core/configmanager.lua +++ b/core/configmanager.lua @@ -361,8 +361,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 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; |