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.certmanager: Apply TLS preset before global settings (thanks Menel)

Browse source 
Allows overriding settings via the global 'ssl' settings as before.
This order was probably accidental. That said, 'ssl' is a giant footgun
we will want to discourage use of.
This commit is contained in:
Kim Alvefur 2022-01-18 08:04:16 +01:00
parent d595ebf9e1
commit 8edd063114
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
core/certmanager.lua
View file

@ -350,11 +350,11 @@ local function create_context(host, mode, ...)
-- We can't read the password interactively when daemonized
password = function() log("error", "Encrypted certificate for %s requires 'ssl' 'password' to be set in config", host); end;
});
cfg:apply(global_ssl_config);
local preset = configmanager.get("*", "tls_preset") or "intermediate";
if preset ~= "legacy" then
cfg:apply(mozilla_ssl_configs[preset]);
end
cfg:apply(global_ssl_config);
for i = select('#', ...), 1, -1 do
cfg:apply(select(i, ...));