diff --git a/cmd/zrok/controller.go b/cmd/zrok/controller.go index 61ee5ed2..2415df92 100644 --- a/cmd/zrok/controller.go +++ b/cmd/zrok/controller.go @@ -43,8 +43,10 @@ func (cmd *controllerCommand) run(_ *cobra.Command, _ []string) { panic(err) } if err := controller.Run(&controller.Config{ - Host: host, - Port: port, + Endpoint: controller.EndpointConfig{ + Host: host, + Port: port, + }, Store: &store.Config{Path: cmd.dbPath}, }); err != nil { panic(err) diff --git a/controller/config.go b/controller/config.go index 32f4434c..745f0737 100644 --- a/controller/config.go +++ b/controller/config.go @@ -3,7 +3,16 @@ package controller import "github.com/openziti-test-kitchen/zrok/controller/store" type Config struct { - Host string - Port int - Store *store.Config + Endpoint EndpointConfig + Proxy ProxyConfig + Store *store.Config +} + +type EndpointConfig struct { + Host string + Port int +} + +type ProxyConfig struct { + UrlTemplate string } diff --git a/controller/controller.go b/controller/controller.go index 3cba96cd..7204af30 100644 --- a/controller/controller.go +++ b/controller/controller.go @@ -39,8 +39,8 @@ func Run(cfg *Config) error { server := rest_server_zrok.NewServer(api) defer func() { _ = server.Shutdown() }() - server.Host = cfg.Host - server.Port = cfg.Port + server.Host = cfg.Endpoint.Host + server.Port = cfg.Endpoint.Port server.ConfigureAPI() if err := server.Serve(); err != nil { return errors.Wrap(err, "api server error")