From e70cd52ed93921f41ed4d2fe1cf1f4457700554a Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Fri, 5 Feb 2016 16:12:01 +0100 Subject: certmanager: Try filename.key if certificate is set to a full filename ending with .crt --- core/certmanager.lua | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/core/certmanager.lua b/core/certmanager.lua index f6715998..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 -- cgit v1.2.3