diff options
author | Matthew Holt <mholt@users.noreply.github.com> | 2019-09-30 09:11:30 -0600 |
---|---|---|
committer | Matthew Holt <mholt@users.noreply.github.com> | 2019-09-30 09:11:30 -0600 |
commit | 1e662262179d326586d2beb849f842b82b7324c4 (patch) | |
tree | 1b2e79e4e27e7b4812f6566104568092bc7bcd7d /caddyconfig/httpcaddyfile/builtins.go | |
parent | 7b4aa108c7d67416bf68574da6c5a43899715b3d (diff) |
httpcaddyfile: Add acme_ca and email global options
Also add ability to access options from individual unmarshalers through
the Helper values
Diffstat (limited to 'caddyconfig/httpcaddyfile/builtins.go')
-rw-r--r-- | caddyconfig/httpcaddyfile/builtins.go | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/caddyconfig/httpcaddyfile/builtins.go b/caddyconfig/httpcaddyfile/builtins.go index ff93b11..ec3740c 100644 --- a/caddyconfig/httpcaddyfile/builtins.go +++ b/caddyconfig/httpcaddyfile/builtins.go @@ -86,6 +86,14 @@ func parseTLS(h Helper) ([]ConfigValue, error) { var mgr caddytls.ACMEManagerMaker var off bool + // fill in global defaults, if configured + if email := h.Option("email"); email != nil { + mgr.Email = email.(string) + } + if acmeCA := h.Option("acme_ca"); acmeCA != nil { + mgr.CA = acmeCA.(string) + } + for h.Next() { // file certificate loader firstLine := h.RemainingArgs() @@ -112,7 +120,6 @@ func parseTLS(h Helper) ([]ConfigValue, error) { hasBlock = true switch h.Val() { - // connection policy case "protocols": args := h.RemainingArgs() @@ -164,7 +171,8 @@ func parseTLS(h Helper) ([]ConfigValue, error) { } mgr.CA = arg[0] - // TODO: other properties for automation manager + default: + return nil, h.Errf("unknown subdirective: %s", h.Val()) } } |