Browse Source

change name of variable

Signed-off-by: Brian Downs <brian.downs@gmail.com>
pull/2146/head
Brian Downs 4 years ago
parent
commit
fa2c1422b3
  1. 2
      pkg/cli/cmds/server.go
  2. 2
      pkg/cli/server/server.go
  3. 2
      pkg/server/server.go
  4. 2
      pkg/server/types.go

2
pkg/cli/cmds/server.go

@ -55,7 +55,7 @@ type Server struct {
ClusterInit bool
ClusterReset bool
EncryptSecrets bool
SetupHooks []func(config.Control) error
StartupHooks []func(config.Control) error
}
var ServerConfig Server

2
pkg/cli/server/server.go

@ -193,7 +193,7 @@ func run(app *cli.Context, cfg *cmds.Server) error {
return errors.Wrap(err, "Invalid tls-min-version")
}
serverConfig.SetupHooks = append(serverConfig.SetupHooks, cfg.SetupHooks...)
serverConfig.StartupHooks = append(serverConfig.StartupHooks, cfg.StartupHooks...)
// TLS config based on mozilla ssl-config generator
// https://ssl-config.mozilla.org/#server=golang&version=1.13.6&config=intermediate&guideline=5.4

2
pkg/server/server.go

@ -60,7 +60,7 @@ func StartServer(ctx context.Context, config *Config) error {
return errors.Wrap(err, "starting tls server")
}
for _, hook := range config.SetupHooks {
for _, hook := range config.StartupHooks {
hook(config.ControlConfig)
}

2
pkg/server/types.go

@ -10,5 +10,5 @@ type Config struct {
ControlConfig config.Control
Rootless bool
SupervisorPort int
SetupHooks []func(config.Control) error
StartupHooks []func(config.Control) error
}

Loading…
Cancel
Save