From 1e662262179d326586d2beb849f842b82b7324c4 Mon Sep 17 00:00:00 2001 From: Matthew Holt Date: Mon, 30 Sep 2019 09:11:30 -0600 Subject: httpcaddyfile: Add acme_ca and email global options Also add ability to access options from individual unmarshalers through the Helper values --- caddyconfig/httpcaddyfile/options.go | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'caddyconfig/httpcaddyfile/options.go') diff --git a/caddyconfig/httpcaddyfile/options.go b/caddyconfig/httpcaddyfile/options.go index dadde28..a60d060 100644 --- a/caddyconfig/httpcaddyfile/options.go +++ b/caddyconfig/httpcaddyfile/options.go @@ -108,3 +108,27 @@ func parseOptStorage(d *caddyfile.Dispenser) (caddy.StorageConverter, error) { } return storage, nil } + +func parseOptACMECA(d *caddyfile.Dispenser) (string, error) { + d.Next() // consume parameter name + if !d.Next() { + return "", d.ArgErr() + } + val := d.Val() + if d.Next() { + return "", d.ArgErr() + } + return val, nil +} + +func parseOptEmail(d *caddyfile.Dispenser) (string, error) { + d.Next() // consume parameter name + if !d.Next() { + return "", d.ArgErr() + } + val := d.Val() + if d.Next() { + return "", d.ArgErr() + } + return val, nil +} -- cgit v1.2.3