aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2020-04-10 19:03:36 +0200
committerKim Alvefur <zash@zash.se>2020-04-10 19:03:36 +0200
commit64ea805d66d7d17b4272caa61cb0fa91a021a9ca (patch)
treee9598d04b21e9996068f2fc128f939797146460e /core
parentfc3e9ae033556f915d6ac565545f8ee11f884151 (diff)
parent96620cafe5f8aa651c449ab930703a7032c990b5 (diff)
downloadprosody-64ea805d66d7d17b4272caa61cb0fa91a021a9ca.tar.gz
prosody-64ea805d66d7d17b4272caa61cb0fa91a021a9ca.zip
Merge 0.11->trunk
Diffstat (limited to 'core')
-rw-r--r--core/certmanager.lua14
1 files changed, 8 insertions, 6 deletions
diff --git a/core/certmanager.lua b/core/certmanager.lua
index 663cebb4..91475467 100644
--- a/core/certmanager.lua
+++ b/core/certmanager.lua
@@ -72,13 +72,15 @@ local function find_cert(user_certs, name)
local key_path = certs .. key_try[i]:format(name);
if stat(crt_path, "mode") == "file" then
- if key_path:sub(-4) == ".crt" then
- key_path = key_path:sub(1, -4) .. "key";
- if stat(key_path, "mode") == "file" then
- log("debug", "Selecting certificate %s with key %s for %s", crt_path, key_path, name);
- return { certificate = crt_path, key = key_path };
+ if crt_path == key_path then
+ if key_path:sub(-4) == ".crt" then
+ key_path = key_path:sub(1, -4) .. "key";
+ elseif key_path:sub(-13) == "fullchain.pem" then
+ key_path = key_path:sub(1, -14) .. "privkey.pem";
end
- elseif stat(key_path, "mode") == "file" then
+ end
+
+ if stat(key_path, "mode") == "file" then
log("debug", "Selecting certificate %s with key %s for %s", crt_path, key_path, name);
return { certificate = crt_path, key = key_path };
end