about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorAlan Pearce2024-07-03 17:47:43 +0200
committerAlan Pearce2024-07-03 17:48:02 +0200
commitbfc935f6ea7b00c539192e486936b8ffbb5a403e (patch)
tree2b171912871ab65ebdba83d36f94a3e1a71ebd2c
parent1bb04d30c6d2e9aef2ff3c0d46d5618be8152bd7 (diff)
downloadwebsite-bfc935f6ea7b00c539192e486936b8ffbb5a403e.tar.lz
website-bfc935f6ea7b00c539192e486936b8ffbb5a403e.tar.zst
website-bfc935f6ea7b00c539192e486936b8ffbb5a403e.zip
fix mismatched log output from certmagic
-rw-r--r--go.mod2
-rw-r--r--go.sum4
-rw-r--r--internal/server/tls.go4
3 files changed, 5 insertions, 5 deletions
diff --git a/go.mod b/go.mod
index c918db2..1c07814 100644
--- a/go.mod
+++ b/go.mod
@@ -26,7 +26,7 @@ require (
 	github.com/stefanfritsch/goldmark-fences v1.0.0
 	github.com/yuin/goldmark v1.7.4
 	gitlab.com/tozd/go/errors v0.8.1
-	go.alanpearce.eu/x v0.0.0-20240702094403-3af026a42747
+	go.alanpearce.eu/x v0.0.0-20240703154602-00de54be50eb
 )
 
 require (
diff --git a/go.sum b/go.sum
index 97c11e9..c11d666 100644
--- a/go.sum
+++ b/go.sum
@@ -225,8 +225,8 @@ github.com/zeebo/pcg v1.0.1 h1:lyqfGeWiv4ahac6ttHs+I5hwtH/+1mrhlCtVNQM2kHo=
 github.com/zeebo/pcg v1.0.1/go.mod h1:09F0S9iiKrwn9rlI5yjLkmrug154/YRW6KnnXVDM/l4=
 gitlab.com/tozd/go/errors v0.8.1 h1:RfylffRAsl3PbDdHNUBEkTleTCiL/RIT+Ef8p0HRNCI=
 gitlab.com/tozd/go/errors v0.8.1/go.mod h1:PvIdUMLpPwxr+KEBxghQaCMydHXGYdJQn/PhdMqYREY=
-go.alanpearce.eu/x v0.0.0-20240702094403-3af026a42747 h1:046LS5Vs9qRJLlKttgkAxFfl97jhYJY+SQRxaQO+/lM=
-go.alanpearce.eu/x v0.0.0-20240702094403-3af026a42747/go.mod h1:FRM6J9HMQ/RV2Q5j+6RKBYWh/YNeEUriGSqDRchiHuQ=
+go.alanpearce.eu/x v0.0.0-20240703154602-00de54be50eb h1:jJawVAo7/RFNbXGAyBSpX8ADb63G/nBideRgveBvmpA=
+go.alanpearce.eu/x v0.0.0-20240703154602-00de54be50eb/go.mod h1:FRM6J9HMQ/RV2Q5j+6RKBYWh/YNeEUriGSqDRchiHuQ=
 go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
 go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
 go.uber.org/atomic v1.8.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
diff --git a/internal/server/tls.go b/internal/server/tls.go
index 85eaac9..9481b6a 100644
--- a/internal/server/tls.go
+++ b/internal/server/tls.go
@@ -25,7 +25,6 @@ type redisConfig struct {
 }
 
 func (s *Server) serveTLS() (err error) {
-	var issuer *certmagic.ACMEIssuer
 	log := s.log.Named("tls")
 
 	// setting cfg.Logger is too late somehow
@@ -33,9 +32,10 @@ func (s *Server) serveTLS() (err error) {
 	cfg := certmagic.NewDefault()
 	cfg.DefaultServerName = s.config.Domains[0]
 
-	issuer = &certmagic.DefaultACME
+	issuer := &certmagic.DefaultACME
 	certmagic.DefaultACME.Agreed = true
 	certmagic.DefaultACME.Email = s.config.Email
+	certmagic.DefaultACME.Logger = certmagic.Default.Logger
 
 	if s.runtimeConfig.Development {
 		ca := s.runtimeConfig.ACMECA