diff options
author | Francis Lavoie <lavofr@gmail.com> | 2023-05-03 13:07:22 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-05-03 17:07:22 +0000 |
commit | 3f20a7c9f348122d5fae7074b9fa17651189bb9a (patch) | |
tree | 138182ce81eb94eccab71c28528ecf0c7b8e0712 /modules/caddypki/acmeserver/caddyfile.go | |
parent | 1af419e7eca0c7b8559ec2f3b397f948f1ef13c2 (diff) |
acmeserver: Configurable `resolvers`, fix smallstep deprecations (#5500)
* acmeserver: Configurable `resolvers`, fix smallstep deprecations
* Improve default net/port
* Update proxy resolvers parsing to use the new function
* Update listeners.go
Co-authored-by: itsxaos <33079230+itsxaos@users.noreply.github.com>
---------
Co-authored-by: itsxaos <33079230+itsxaos@users.noreply.github.com>
Diffstat (limited to 'modules/caddypki/acmeserver/caddyfile.go')
-rw-r--r-- | modules/caddypki/acmeserver/caddyfile.go | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/modules/caddypki/acmeserver/caddyfile.go b/modules/caddypki/acmeserver/caddyfile.go index ae2d8ef..3b52113 100644 --- a/modules/caddypki/acmeserver/caddyfile.go +++ b/modules/caddypki/acmeserver/caddyfile.go @@ -29,8 +29,9 @@ func init() { // parseACMEServer sets up an ACME server handler from Caddyfile tokens. // // acme_server [<matcher>] { -// ca <id> -// lifetime <duration> +// ca <id> +// lifetime <duration> +// resolvers <addresses...> // } func parseACMEServer(h httpcaddyfile.Helper) ([]httpcaddyfile.ConfigValue, error) { if !h.Next() { @@ -74,6 +75,12 @@ func parseACMEServer(h httpcaddyfile.Helper) ([]httpcaddyfile.ConfigValue, error } acmeServer.Lifetime = caddy.Duration(dur) + + case "resolvers": + acmeServer.Resolvers = h.RemainingArgs() + if len(acmeServer.Resolvers) == 0 { + return nil, h.Errf("must specify at least one resolver address") + } } } } |