aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-02-05 16:31:34 +0100
committerKim Alvefur <zash@zash.se>2016-02-05 16:31:34 +0100
commit8da0f76f3c6a203aff0a928987a8121c3c7a146d (patch)
tree6815ba825d7158b632e3a9713842575d40d20e9a
parente807440f367e57213228c150ddabf5d21fc0a795 (diff)
parentef1ad262f7fcf3d53c16b79cfbb4e067a19adea3 (diff)
downloadprosody-8da0f76f3c6a203aff0a928987a8121c3c7a146d.tar.gz
prosody-8da0f76f3c6a203aff0a928987a8121c3c7a146d.zip
Merge 0.10->trunk
-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, ...));