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

core.configmanager: Remove dependency on 'prosody' global for Credential

Browse source 
Minimizing dependencies on global state is nice, as it makes using
configmanager outside of Prosody easier.
This commit is contained in:
Kim Alvefur 2025-02-22 00:00:41 +01:00
parent 13dc010593
commit 9eedb15c6f
2 changed files with 21 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
util/startup.lua
View file

@ -89,6 +89,14 @@ function startup.read_config()
end
end
prosody.config_file = filename
local credentials_directory = os.getenv("CREDENTIALS_DIRECTORY");
if credentials_directory then
config.set_credentials_directory(credentials_directory);
elseif prosody.process_type == "prosody" then
config.set_credential_fallback_mode("error");
else
config.set_credential_fallback_mode("warn");
end
local ok, level, err = config.load(filename);
if not ok then
print("\n");
@ -271,7 +279,6 @@ function startup.init_global_state()
config = CFG_CONFIGDIR or ".";
plugins = CFG_PLUGINDIR or "plugins";
data = "data";
credentials = os.getenv("CREDENTIALS_DIRECTORY");
};
prosody.arg = _G.arg;