all repos — website @ 51024675983d865c4635fa70184f827c6c543d02

My website

provision wildcard certificate correctly

Alan Pearce
commit

51024675983d865c4635fa70184f827c6c543d02

parent

885a0ed62daea18c444cc67033db1d21312a32c0

1 file changed, 7 insertions(+), 1 deletion(-)

changed files
M internal/server/tls.gointernal/server/tls.go
@@ -5,6 +5,7 @@ "context"
"crypto/x509" "net" "net/http" + "slices" "strconv" "go.alanpearce.eu/x/listenfd"
@@ -34,6 +35,9 @@ }
func (s *Server) serveTLS() (err error) { log := s.log.Named("tls") + + wildcardDomain := "*." + s.config.WildcardDomain + certificateDomains := slices.Clone(s.config.Domains) // setting cfg.Logger is too late somehow certmagic.Default.Logger = log.GetLogger().Named("certmagic")
@@ -96,6 +100,8 @@ },
}, }) + certificateDomains = append(slices.Clone(s.config.Domains), wildcardDomain) + log.Info("acme", "username", acme.Username, "subdomain", acme.Subdomain, "server_url", acme.ServerURL) rs := certmagic_redis.New()
@@ -164,7 +170,7 @@ s.runtimeConfig.Port,
"https_port", s.runtimeConfig.TLSPort, ) - err = cfg.ManageAsync(context.TODO(), s.config.Domains) + err = cfg.ManageAsync(context.TODO(), certificateDomains) if err != nil { return errors.Wrap(err, "could not enable TLS") }