diff options
author | Matthew Holt <mholt@users.noreply.github.com> | 2019-05-16 16:05:38 -0600 |
---|---|---|
committer | Matthew Holt <mholt@users.noreply.github.com> | 2019-05-16 16:05:38 -0600 |
commit | 1f0c061ce30f218e63fcc17e0fdfc8b90d754ba5 (patch) | |
tree | ef148ac39ec520d14342ce48cec07f5efe0379f3 /modules/caddytls/acmemanager.go | |
parent | ff5b4639d597203f8aec43e5eae8fe3774976d32 (diff) |
Architectural shift to using context for config and module state
Diffstat (limited to 'modules/caddytls/acmemanager.go')
-rw-r--r-- | modules/caddytls/acmemanager.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/modules/caddytls/acmemanager.go b/modules/caddytls/acmemanager.go index 40e2d24..59fc7c3 100644 --- a/modules/caddytls/acmemanager.go +++ b/modules/caddytls/acmemanager.go @@ -40,10 +40,10 @@ func (m *acmeManagerMaker) newManager(interactive bool) (certmagic.Manager, erro return nil, nil } -func (m *acmeManagerMaker) Provision() error { +func (m *acmeManagerMaker) Provision(ctx caddy2.Context) error { // DNS providers if m.Challenges.DNS != nil { - val, err := caddy2.LoadModuleInline("provider", "tls.dns", m.Challenges.DNS) + val, err := ctx.LoadModuleInline("provider", "tls.dns", m.Challenges.DNS) if err != nil { return fmt.Errorf("loading TLS storage module: %s", err) } @@ -53,7 +53,7 @@ func (m *acmeManagerMaker) Provision() error { // policy-specific storage implementation if m.Storage != nil { - val, err := caddy2.LoadModuleInline("system", "caddy.storage", m.Storage) + val, err := ctx.LoadModuleInline("system", "caddy.storage", m.Storage) if err != nil { return fmt.Errorf("loading TLS storage module: %s", err) } @@ -93,10 +93,10 @@ func (m *acmeManagerMaker) setDefaults() { // makeCertMagicConfig converts m into a certmagic.Config, because // this is a special case where the default manager is the certmagic // Config and not a separate manager. -func (m *acmeManagerMaker) makeCertMagicConfig() certmagic.Config { +func (m *acmeManagerMaker) makeCertMagicConfig(ctx caddy2.Context) certmagic.Config { storage := m.storage if storage == nil { - storage = caddy2.GetStorage() + storage = ctx.Storage() } var ond *certmagic.OnDemandConfig |