diff options
| author | Matthew Holt <mholt@users.noreply.github.com> | 2020-04-30 16:15:20 -0600 |
|---|---|---|
| committer | Matthew Holt <mholt@users.noreply.github.com> | 2020-04-30 16:15:20 -0600 |
| commit | a1796c2f147e6a3d395e015600b51b67136292eb (patch) | |
| tree | 1df99e0506a235d3235c12ac018952fbd9354aa3 /modules/caddytls/acmeissuer.go | |
| parent | f931c26f68030861df340c65c2ebd835f1eda11e (diff) | |
caddytls: Adjust DNS challenge structure; clarify some docs
Diffstat (limited to 'modules/caddytls/acmeissuer.go')
| -rw-r--r-- | modules/caddytls/acmeissuer.go | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/modules/caddytls/acmeissuer.go b/modules/caddytls/acmeissuer.go index 854e6d5..7296d28 100644 --- a/modules/caddytls/acmeissuer.go +++ b/modules/caddytls/acmeissuer.go @@ -86,8 +86,8 @@ func (ACMEIssuer) CaddyModule() caddy.ModuleInfo { // Provision sets up m. func (m *ACMEIssuer) Provision(ctx caddy.Context) error { // DNS providers - if m.Challenges != nil && m.Challenges.DNSRaw != nil { - val, err := ctx.LoadModule(m.Challenges, "DNSRaw") + if m.Challenges != nil && m.Challenges.DNS != nil && m.Challenges.DNS.ProviderRaw != nil { + val, err := ctx.LoadModule(m.Challenges.DNS, "ProviderRaw") if err != nil { return fmt.Errorf("loading DNS provider module: %v", err) } @@ -95,7 +95,7 @@ func (m *ACMEIssuer) Provision(ctx caddy.Context) error { if err != nil { return fmt.Errorf("making DNS provider: %v", err) } - m.Challenges.DNS = prov + m.Challenges.DNS.provider = prov } // add any custom CAs to trust store @@ -152,7 +152,9 @@ func (m *ACMEIssuer) makeIssuerTemplate() (certmagic.ACMEManager, error) { template.DisableTLSALPNChallenge = m.Challenges.TLSALPN.Disabled template.AltTLSALPNPort = m.Challenges.TLSALPN.AlternatePort } - template.DNSProvider = m.Challenges.DNS + if m.Challenges.DNS != nil { + template.DNSProvider = m.Challenges.DNS.provider + } template.ListenHost = m.Challenges.BindHost } |