prosody
a699d611a0ba
core/portmanager.lua

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Diff

core/portmanager.lua @ 13815:a699d611a0ba

Merge 13.0->trunk
author Matthew Wild <mwild1@gmail.com>
date Thu, 03 Apr 2025 12:04:19 +0100
parent 13814:98e68a68c1da
line wrap: on
line diff
--- a/core/portmanager.lua	Wed Apr 02 17:28:33 2025 +0100
+++ b/core/portmanager.lua	Thu Apr 03 12:04:19 2025 +0100
@@ -253,10 +253,12 @@
 				-- TODO should this be some generic thing? e.g. in the service definition
 				alternate_host = config.get(host, "http_host");
 			end
-			local ssl, err, cfg = certmanager.create_context(alternate_host or host, "server", prefix_ssl_config, active_service.tls_cfg);
+			local autocert = certmanager.find_host_cert(alternate_host or host);
+			local ssl, err, cfg = certmanager.create_context(alternate_host or host, "server", prefix_ssl_config, autocert, active_service.tls_cfg);
 			if not ssl then
 				log("error", "Error creating TLS context for SNI host %s: %s", host, err);
 			else
+				log("debug", "Using certificate %s for %s (%s) on %s (%s)", cfg.certificate, service or name, name, alternate_host or host, host)
 				local ok, err = active_service.server:sslctx():set_sni_host(
 					alternate_host or host,
 					cfg.certificate,