# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1454686294 -3600
# Node ID c793f9d13a36aa615bed64fcaea05ef66e9966c5
# Parent  fa6cd0e9105deb591834f5eae4d83cf3b8a38677# Parent  b1a10985850242fe0efd215748eb4b9f18f3239d
Merge 0.10->trunk

diff -r fa6cd0e9105d -r c793f9d13a36 core/certmanager.lua
--- a/core/certmanager.lua	Fri Feb 05 00:10:46 2016 +0000
+++ b/core/certmanager.lua	Fri Feb 05 16:31:34 2016 +0100
@@ -63,14 +63,13 @@
 		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 @@
 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 @@
 		-- 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, ...));