# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1514496092 -3600
# Node ID c494e12ce81f8edde6dc8ccf110d9f0628ddbf76
# Parent  d424fe42b4d296f99353b13ebc57687ae1479862# Parent  4f75f4da6d4e0c8aea32320b733a3deaa6e51c4e
Merge 0.10->trunk

diff -r d424fe42b4d2 -r c494e12ce81f core/certmanager.lua
--- 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