aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-02-05 15:03:39 +0100
committerKim Alvefur <zash@zash.se>2016-02-05 15:03:39 +0100
commit439a62a8538bca21d08d3135c5a833e601bfec8b (patch)
treed5d7566b35dc16f8faf595ba42d50a01b00826d4
parente2b370c6bf9d1495d9d180fb8713d3a5d774e0fd (diff)
downloadprosody-439a62a8538bca21d08d3135c5a833e601bfec8b.tar.gz
prosody-439a62a8538bca21d08d3135c5a833e601bfec8b.zip
certmanager: Apply global ssl config later so certificate/key is not overwritten by magic
-rw-r--r--core/certmanager.lua2
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, ...));