Mercurial Mercurial > prosody > prosody / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge 0.11->trunk
authorKim Alvefur <zash@zash.se>
Fri, 10 Apr 2020 19:03:36 +0200
changeset 10714 549e408bab14
parent 10712 6119e4f87c32 (current diff)
parent 10713 fcf7f50ccdd0 (diff)
child 10715 d2e4584ba7b3
Merge 0.11->trunk
core/certmanager.lua file | annotate | diff | comparison | revisions 
--- 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
prosody