Software / code / prosody
Changeset
7144:f855ba7da30e
certmanager: Apply global ssl config later so certificate/key is not overwritten by magic
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Fri, 05 Feb 2016 15:03:39 +0100 |
| parents | 7140:b19438c2ca1b |
| children | 7145:b1a109858502 |
| files | core/certmanager.lua |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/core/certmanager.lua Fri Feb 05 00:03:41 2016 +0000 +++ b/core/certmanager.lua Fri Feb 05 15:03:39 2016 +0100 @@ -120,7 +120,6 @@ local function create_context(host, mode, ...) local cfg = new_config(); cfg:apply(core_defaults); - cfg:apply(global_ssl_config); local service_name, port = host:match("^(%w+) port (%d+)$"); if service_name then cfg:apply(find_service_cert(service_name, tonumber(port))); @@ -132,6 +131,7 @@ -- 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); for i = select('#', ...), 1, -1 do cfg:apply(select(i, ...));
