Stowage/caddy
2
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-10-19 15:53:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

caddytls: Adjust DNS challenge structure; clarify some docs

Browse source
This commit is contained in:
Matthew Holt 2020-04-30 16:15:20 -06:00
parent f931c26f68
commit a1796c2f14
No known key found for this signature in database
GPG key ID: 2A349DD577D586A5
4 changed files with 41 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

10
modules/caddytls/acmeissuer.go
View file

@ -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
}