OrgGo
/
caddy
mirror of https://github.com/caddyserver/caddy.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

caddytls: Fix resolvers option of acme issuer (Caddyfile) 

Reported in:
https://caddy.community/t/dns-challenge-with-namecheap-and-split-horizon-dns/9611/17?u=matt
This commit is contained in:
Matthew Holt 2020-09-09 10:21:59 -06:00
parent 00e6b77fe4
commit 9859ab8148
No known key found for this signature in database
GPG Key ID: 2A349DD577D586A5
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/caddytls/acmeissuer.go
View File

@ -345,9 +345,6 @@ func (iss *ACMEIssuer) UnmarshalCaddyfile(d *caddyfile.Dispenser) error {
iss.Challenges.DNS.ProviderRaw = caddyconfig.JSONModuleObject(dnsProvModuleInstance, "name", provName, nil) iss.Challenges.DNS.ProviderRaw = caddyconfig.JSONModuleObject(dnsProvModuleInstance, "name", provName, nil)
case "resolvers": case "resolvers":
if !d.NextArg() {
return d.ArgErr()
}
if iss.Challenges == nil { if iss.Challenges == nil {
iss.Challenges = new(ChallengesConfig) iss.Challenges = new(ChallengesConfig)
} }
@ -355,6 +352,9 @@ func (iss *ACMEIssuer) UnmarshalCaddyfile(d *caddyfile.Dispenser) error {
iss.Challenges.DNS = new(DNSChallengeConfig) iss.Challenges.DNS = new(DNSChallengeConfig)
} }
iss.Challenges.DNS.Resolvers = d.RemainingArgs() iss.Challenges.DNS.Resolvers = d.RemainingArgs()
if len(iss.Challenges.DNS.Resolvers) == 0 {
return d.ArgErr()
}
default: default:
return d.Errf("unrecognized ACME issuer property: %s", d.Val()) return d.Errf("unrecognized ACME issuer property: %s", d.Val())