# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1586538216 -7200
# Node ID 549e408bab1427934dd126c8742ccfc5908a76a3
# Parent  6119e4f87c32c3c1df59b500e5e9c03dfae9f389# Parent  fcf7f50ccdd051f875673e14d27147c1980cf84d
Merge 0.11->trunk

diff -r 6119e4f87c32 -r 549e408bab14 core/certmanager.lua
--- a/core/certmanager.lua	Fri Apr 03 22:39:48 2020 +0200
+++ b/core/certmanager.lua	Fri Apr 10 19:03:36 2020 +0200
@@ -72,13 +72,15 @@
 		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