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

core.certmanager: Resolve certs path relative to config dir

Browse source 
Otherwise the default "certs" would be relative to $PWD, which works
when testing from a source checkout, but not on installed systems where
it usually points to the data directory.

Also, the LuaFileSystem dir() iterator throws a hard error, which may
cause a crash or other problems.
This commit is contained in:
Kim Alvefur 2021-05-07 16:35:37 +02:00
parent 4cd3fcfb0b
commit 2c902f163f
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
core/certmanager.lua
View file

@ -158,7 +158,7 @@ local cert_index;
local function find_host_cert(host)
if not host then return nil; end
if not cert_index then
cert_index = index_certs(global_certificates);
cert_index = index_certs(resolve_path(config_path, global_certificates));
end
local certs = cert_index[host];
if certs then
@ -177,7 +177,7 @@ end
local function find_service_cert(service, port)
if not cert_index then
cert_index = index_certs(global_certificates);
cert_index = index_certs(resolve_path(config_path, global_certificates));
end
for _, certs in pairs(cert_index) do
for cert_filename, services in pairs(certs) do
@ -346,7 +346,7 @@ local function reload_ssl_config()
if luasec_has.options.no_compression then
core_defaults.options.no_compression = configmanager.get("*", "ssl_compression") ~= true;
end
cert_index = index_certs(global_certificates);
cert_index = index_certs(resolve_path(config_path, global_certificates));
end
prosody.events.add_handler("config-reloaded", reload_ssl_config);