diff options
| author | Kim Alvefur <zash@zash.se> | 2016-02-05 15:03:39 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2016-02-05 15:03:39 +0100 |
| commit | c607c09f92ee1d490976dc69493a1bdc5db42752 (patch) | |
| tree | d5d7566b35dc16f8faf595ba42d50a01b00826d4 /core/certmanager.lua | |
| parent | 7a87ef0b67fc74c7b55ed19dccf7bd66df4079ce (diff) | |
| download | prosody-c607c09f92ee1d490976dc69493a1bdc5db42752.tar.gz prosody-c607c09f92ee1d490976dc69493a1bdc5db42752.zip | |
certmanager: Apply global ssl config later so certificate/key is not overwritten by magic
Diffstat (limited to 'core/certmanager.lua')
| -rw-r--r-- | core/certmanager.lua | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/certmanager.lua b/core/certmanager.lua index b1ff648d..f6715998 100644 --- a/core/certmanager.lua +++ b/core/certmanager.lua @@ -120,7 +120,6 @@ end 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 @@ 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); for i = select('#', ...), 1, -1 do cfg:apply(select(i, ...)); |