Comparison

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
comparison
equal deleted inserted replaced
13812:04232123ba66 13815:a699d611a0ba
251 local alternate_host = name and config.get(host, name.."_host"); 251 local alternate_host = name and config.get(host, name.."_host");
252 if not alternate_host and name == "https" then 252 if not alternate_host and name == "https" then
253 -- TODO should this be some generic thing? e.g. in the service definition 253 -- TODO should this be some generic thing? e.g. in the service definition
254 alternate_host = config.get(host, "http_host"); 254 alternate_host = config.get(host, "http_host");
255 end 255 end
256 local ssl, err, cfg = certmanager.create_context(alternate_host or host, "server", prefix_ssl_config, active_service.tls_cfg); 256 local autocert = certmanager.find_host_cert(alternate_host or host);
257 local ssl, err, cfg = certmanager.create_context(alternate_host or host, "server", prefix_ssl_config, autocert, active_service.tls_cfg);
257 if not ssl then 258 if not ssl then
258 log("error", "Error creating TLS context for SNI host %s: %s", host, err); 259 log("error", "Error creating TLS context for SNI host %s: %s", host, err);
259 else 260 else
261 log("debug", "Using certificate %s for %s (%s) on %s (%s)", cfg.certificate, service or name, name, alternate_host or host, host)
260 local ok, err = active_service.server:sslctx():set_sni_host( 262 local ok, err = active_service.server:sslctx():set_sni_host(
261 alternate_host or host, 263 alternate_host or host,
262 cfg.certificate, 264 cfg.certificate,
263 cfg.key 265 cfg.key
264 ); 266 );