diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/caddypki/acmeserver/acmeserver.go | 2 | ||||
| -rw-r--r-- | modules/caddypki/pki.go | 10 | ||||
| -rw-r--r-- | modules/caddytls/internalissuer.go | 2 |
3 files changed, 5 insertions, 9 deletions
diff --git a/modules/caddypki/acmeserver/acmeserver.go b/modules/caddypki/acmeserver/acmeserver.go index 388aa52..ff021b4 100644 --- a/modules/caddypki/acmeserver/acmeserver.go +++ b/modules/caddypki/acmeserver/acmeserver.go @@ -102,7 +102,7 @@ func (ash *Handler) Provision(ctx caddy.Context) error { return err } pkiApp := appModule.(*caddypki.PKI) - ca, err := pkiApp.GetCA(ash.CA, &ctx) + ca, err := pkiApp.GetCA(ctx, ash.CA) if err != nil { return err } diff --git a/modules/caddypki/pki.go b/modules/caddypki/pki.go index f391fda..c19bd0f 100644 --- a/modules/caddypki/pki.go +++ b/modules/caddypki/pki.go @@ -121,9 +121,8 @@ func (p *PKI) Stop() error { // GetCA retrieves a CA by ID. If the ID is the default // CA ID, and it hasn't been provisioned yet, it will -// be provisioned. The context must be passed if this -// is called from a module's Provision(). -func (p *PKI) GetCA(id string, ctx *caddy.Context) (*CA, error) { +// be provisioned. +func (p *PKI) GetCA(ctx caddy.Context, id string) (*CA, error) { ca, ok := p.CAs[id] if !ok { // for anything other than the default CA ID, error out if it wasn't configured @@ -132,10 +131,7 @@ func (p *PKI) GetCA(id string, ctx *caddy.Context) (*CA, error) { } // for the default CA ID, provision it, because we want it to "just work" - if ctx == nil { - return nil, fmt.Errorf("cannot provision default CA without the context") - } - err := p.ProvisionDefaultCA(*ctx) + err := p.ProvisionDefaultCA(ctx) if err != nil { return nil, fmt.Errorf("failed to provision default CA: %s", err) } diff --git a/modules/caddytls/internalissuer.go b/modules/caddytls/internalissuer.go index d9b6117..5de3af5 100644 --- a/modules/caddytls/internalissuer.go +++ b/modules/caddytls/internalissuer.go @@ -78,7 +78,7 @@ func (iss *InternalIssuer) Provision(ctx caddy.Context) error { return err } pkiApp := appModule.(*caddypki.PKI) - ca, err := pkiApp.GetCA(iss.CA, &ctx) + ca, err := pkiApp.GetCA(ctx, iss.CA) if err != nil { return err } |