Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Thu, 28 Dec 2017 22:21:32 +0100
changeset 8498 c494e12ce81f
parent 8496 d424fe42b4d2 (current diff)
parent 8497 4f75f4da6d4e (diff)
child 8500 b703f56b8194
Merge 0.10->trunk
--- a/core/certmanager.lua	Wed Dec 13 17:31:31 2017 +0100
+++ b/core/certmanager.lua	Thu Dec 28 22:21:32 2017 +0100
@@ -176,8 +176,8 @@
 	local user_ssl_config = cfg:final();
 
 	if mode == "server" then
+		if not user_ssl_config.certificate then return nil, "No certificate present in SSL/TLS configuration for "..host; end
 		if not user_ssl_config.key then return nil, "No key present in SSL/TLS configuration for "..host; end
-		if not user_ssl_config.certificate then return nil, "No certificate present in SSL/TLS configuration for "..host; end
 	end
 
 	for option in pairs(path_options) do