From b2d456d17ed6febb602887af7d0474a6d5ab46df Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Thu, 18 Feb 2021 18:09:17 +0100 Subject: [PATCH] Upgrade certmagic Upgrade to caddy's pinned version. --- go.mod | 3 +-- go.sum | 6 ++---- server.go | 3 +-- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/go.mod b/go.mod index c64f721..94d3ca0 100644 --- a/go.mod +++ b/go.mod @@ -4,9 +4,8 @@ go 1.15 require ( git.sr.ht/~emersion/go-scfg v0.0.0-20201019143924-142a8aa629fc - github.com/caddyserver/certmagic v0.12.0 + github.com/caddyserver/certmagic v0.12.1-0.20210211020017-ebb8d8b435b4 github.com/klauspost/cpuid v1.3.1 // indirect - github.com/mholt/acmez v0.1.3 // indirect github.com/miekg/dns v1.1.38 // indirect github.com/pires/go-proxyproto v0.4.2 github.com/pkg/errors v0.9.1 // indirect diff --git a/go.sum b/go.sum index ea6e3ba..ff83e8e 100644 --- a/go.sum +++ b/go.sum @@ -2,8 +2,8 @@ git.sr.ht/~emersion/go-scfg v0.0.0-20201019143924-142a8aa629fc h1:51BD67xFX+bozd git.sr.ht/~emersion/go-scfg v0.0.0-20201019143924-142a8aa629fc/go.mod h1:t+Ww6SR24yYnXzEWiNlOY0AFo5E9B73X++10lrSpp4U= github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/caddyserver/certmagic v0.12.0 h1:1f7kxykaJkOVVpXJ8ZrC6RAO5F6+kKm9U7dBFbLNeug= -github.com/caddyserver/certmagic v0.12.0/go.mod h1:tr26xh+9fY5dN0J6IPAlMj07qpog22PJKa7Nw7j835U= +github.com/caddyserver/certmagic v0.12.1-0.20210211020017-ebb8d8b435b4 h1:YPHanayqEADEHFxGui7lqQ0tx4rypJaD2y4Y7Tip/ks= +github.com/caddyserver/certmagic v0.12.1-0.20210211020017-ebb8d8b435b4/go.mod h1:CUPfwomVXGCyV77EQbR3v7H4tGJ4pX16HATeR55rqws= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -21,8 +21,6 @@ github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/libdns/libdns v0.1.0 h1:0ctCOrVJsVzj53mop1angHp/pE3hmAhP7KiHvR0HD04= github.com/libdns/libdns v0.1.0/go.mod h1:yQCXzk1lEZmmCPa857bnk4TsOiqYasqpyOEeSObbb40= -github.com/mholt/acmez v0.1.1 h1:KQODCqk+hBn3O7qfCRPj6L96uG65T5BSS95FKNEqtdA= -github.com/mholt/acmez v0.1.1/go.mod h1:8qnn8QA/Ewx8E3ZSsmscqsIjhhpxuy9vqdgbX2ceceM= github.com/mholt/acmez v0.1.3 h1:J7MmNIk4Qf9b8mAGqAh4XkNeowv3f1zW816yf4zt7Qk= github.com/mholt/acmez v0.1.3/go.mod h1:8qnn8QA/Ewx8E3ZSsmscqsIjhhpxuy9vqdgbX2ceceM= github.com/miekg/dns v1.1.30/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM= diff --git a/server.go b/server.go index 9914912..ed392d3 100644 --- a/server.go +++ b/server.go @@ -85,8 +85,7 @@ func (srv *Server) startACME() error { srv.ACMEConfig = certmagic.New(srv.acmeCache.cache, *srv.ACMEConfig) srv.ACMEManager = certmagic.NewACMEManager(srv.ACMEConfig, *srv.ACMEManager) - srv.ACMEConfig.Issuer = srv.ACMEManager - srv.ACMEConfig.Revoker = srv.ACMEManager + srv.ACMEConfig.Issuers = []certmagic.Issuer{srv.ACMEManager} srv.acmeCache.config = srv.ACMEConfig