aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2016-02-08 21:50:04 +0000
committerMatthew Wild <mwild1@gmail.com>2016-02-08 21:50:04 +0000
commitbee4aa35ce6c7da81c5c563ef5b08d8188af8451 (patch)
tree319a8e0b86ea7b6b40896c314d448c32d6c31974
parent65f42319fe354486f7b9191ad6e8c6e9e1b2f5d2 (diff)
parent8da0f76f3c6a203aff0a928987a8121c3c7a146d (diff)
downloadprosody-bee4aa35ce6c7da81c5c563ef5b08d8188af8451.tar.gz
prosody-bee4aa35ce6c7da81c5c563ef5b08d8188af8451.zip
Merge
-rw-r--r--core/certmanager.lua7
1 files changed, 3 insertions, 4 deletions
diff --git a/core/certmanager.lua b/core/certmanager.lua
index b1ff648d..978a9efc 100644
--- a/core/certmanager.lua
+++ b/core/certmanager.lua
@@ -63,14 +63,13 @@ local function find_cert(user_certs, name)
local key_path = certs .. key_try[i]:format(name);
if stat(crt_path, "mode") == "file" then
- if stat(key_path, "mode") == "file" then
- return { certificate = crt_path, key = key_path };
- end
if key_path:sub(-4) == ".crt" then
key_path = key_path:sub(1, -4) .. "key";
if stat(key_path, "mode") == "file" then
return { certificate = crt_path, key = key_path };
end
+ elseif stat(key_path, "mode") == "file" then
+ return { certificate = crt_path, key = key_path };
end
end
end
@@ -120,7 +119,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 +130,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, ...));