Skip to content

Commit d9920f0

Browse files
committed
tls/acme: Return certmagic.New config in GetConfigForCert
Might have caused partially broken configurations e.g. #619.
1 parent b8ff116 commit d9920f0

1 file changed

Lines changed: 6 additions & 9 deletions

File tree

internal/tls/acme/acme.go

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,7 @@ func (l *Loader) Init(cfg *config.Map) error {
8383
l.cache = certmagic.NewCache(certmagic.CacheOptions{
8484
Logger: cmLog,
8585
GetConfigForCert: func(c certmagic.Certificate) (*certmagic.Config, error) {
86-
return &certmagic.Config{
87-
Storage: l.store,
88-
Logger: cmLog,
89-
}, nil
86+
return l.cfg, nil
9087
},
9188
})
9289

@@ -95,7 +92,7 @@ func (l *Loader) Init(cfg *config.Map) error {
9592
Logger: cmLog,
9693
DefaultServerName: hostname,
9794
})
98-
mngr := certmagic.NewACMEIssuer(l.cfg, certmagic.ACMEIssuer{
95+
issuer := certmagic.NewACMEIssuer(l.cfg, certmagic.ACMEIssuer{
9996
Logger: cmLog,
10097
CA: caPath,
10198
Email: email,
@@ -104,19 +101,19 @@ func (l *Loader) Init(cfg *config.Map) error {
104101

105102
switch challenge {
106103
case "dns-01":
107-
mngr.DisableTLSALPNChallenge = true
108-
mngr.DisableHTTPChallenge = true
104+
issuer.DisableTLSALPNChallenge = true
105+
issuer.DisableHTTPChallenge = true
109106
if provider == nil {
110107
return fmt.Errorf("tls.loader.acme: dns-01 challenge requires a configured DNS provider")
111108
}
112-
mngr.DNS01Solver = &certmagic.DNS01Solver{
109+
issuer.DNS01Solver = &certmagic.DNS01Solver{
113110
DNSProvider: provider,
114111
OverrideDomain: overrideDomain,
115112
}
116113
default:
117114
return fmt.Errorf("tls.loader.acme: challenge not supported")
118115
}
119-
l.cfg.Issuers = []certmagic.Issuer{mngr}
116+
l.cfg.Issuers = []certmagic.Issuer{issuer}
120117

121118
if module.NoRun {
122119
return nil

0 commit comments

Comments
 (0)