diff options
author | Matt Holt <mholt@users.noreply.github.com> | 2020-07-30 15:18:14 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-07-30 15:18:14 -0600 |
commit | 6a14e2c2a8881d5e90f1ee363ec4662a3f87402b (patch) | |
tree | 3d10bdfe62e709e70e16725659e860bee20ca8e6 /caddyconfig/httpcaddyfile/options.go | |
parent | 2bc30bb780f3b93593a2a9e42db6ab215fe12902 (diff) |
caddytls: Replace lego with acmez (#3621)
* Replace lego with acmez; upgrade CertMagic
* Update integration test
Diffstat (limited to 'caddyconfig/httpcaddyfile/options.go')
-rw-r--r-- | caddyconfig/httpcaddyfile/options.go | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/caddyconfig/httpcaddyfile/options.go b/caddyconfig/httpcaddyfile/options.go index 2b6b111..f69ca3e 100644 --- a/caddyconfig/httpcaddyfile/options.go +++ b/caddyconfig/httpcaddyfile/options.go @@ -20,6 +20,7 @@ import ( "github.com/caddyserver/caddy/v2" "github.com/caddyserver/caddy/v2/caddyconfig/caddyfile" "github.com/caddyserver/caddy/v2/modules/caddytls" + "github.com/mholt/acmez/acme" ) func init() { @@ -182,7 +183,7 @@ func parseOptStorage(d *caddyfile.Dispenser) (interface{}, error) { } func parseOptACMEEAB(d *caddyfile.Dispenser) (interface{}, error) { - eab := new(caddytls.ExternalAccountBinding) + eab := new(acme.EAB) for d.Next() { if d.NextArg() { return nil, d.ArgErr() @@ -195,11 +196,11 @@ func parseOptACMEEAB(d *caddyfile.Dispenser) (interface{}, error) { } eab.KeyID = d.Val() - case "hmac": + case "mac_key": if !d.NextArg() { return nil, d.ArgErr() } - eab.HMAC = d.Val() + eab.MACKey = d.Val() default: return nil, d.Errf("unrecognized parameter '%s'", d.Val()) |