diff options
Diffstat (limited to 'modules/caddypki/adminapi.go')
| -rw-r--r-- | modules/caddypki/adminapi.go | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/modules/caddypki/adminapi.go b/modules/caddypki/adminapi.go index f03c6b6..435af34 100644 --- a/modules/caddypki/adminapi.go +++ b/modules/caddypki/adminapi.go @@ -20,8 +20,9 @@ import ( "net/http" "strings" - "github.com/caddyserver/caddy/v2" "go.uber.org/zap" + + "github.com/caddyserver/caddy/v2" ) func init() { @@ -49,20 +50,10 @@ func (a *adminAPI) Provision(ctx caddy.Context) error { a.ctx = ctx a.log = ctx.Logger(a) // TODO: passing in 'a' is a hack until the admin API is officially extensible (see #5032) - // First check if the PKI app was configured, because - // a.ctx.App() has the side effect of instantiating - // and provisioning an app even if it wasn't configured. - pkiAppConfigured := a.ctx.AppIsConfigured("pki") - if !pkiAppConfigured { - return nil - } - - // Load the PKI app, so we can query it for information. - appModule, err := a.ctx.App("pki") - if err != nil { - return err + // Avoid initializing PKI if it wasn't configured + if pkiApp := a.ctx.AppIfConfigured("pki"); pkiApp != nil { + a.pkiApp = pkiApp.(*PKI) } - a.pkiApp = appModule.(*PKI) return nil } |