refactor: extract WithRoutes config option

2 files changed, 16 insertions, 10 deletions

diff --git a/cmd/gtwy/main.go b/cmd/gtwy/main.go
index 84c9f183..1e9d3a39 100644
--- a/cmd/gtwy/main.go
+++ b/cmd/gtwy/main.go
@@ -10,16 +10,22 @@ import (
 	"gitlab.com/mokhax/spike/pkg/srv"
 )
 
-func main() {
-	mux := http.NewServeMux()
-	mux.Handle("/", prxy.New(map[string]string{
-		"idp.example.com": "localhost:8282",
-		"ui.example.com":  "localhost:8283",
-		"api.example.com": "localhost:8284",
-	}))
+func WithRoutes() cfg.Option {
+	return func(c *cfg.Config) {
+		mux := http.NewServeMux()
+		mux.Handle("/", prxy.New(map[string]string{
+			"idp.example.com": "localhost:8282",
+			"ui.example.com":  "localhost:8283",
+			"api.example.com": "localhost:8284",
+		}))
+
+		cfg.WithMux(mux)(c)
+	}
+}
 
+func main() {
 	log.Fatal(srv.Run(cfg.New(
 		env.Fetch("BIND_ADDR", ":8080"),
-		cfg.WithMux(mux),
+		WithRoutes(),
 	)))
 }
diff --git a/pkg/cfg/tls.go b/pkg/cfg/tls.go
index 6414b250..6441df8f 100644
--- a/pkg/cfg/tls.go
+++ b/pkg/cfg/tls.go
@@ -6,10 +6,10 @@ import (
 	"github.com/xlgmokha/x/pkg/x"
 )
 
-func WithSelfSigned(cert, key string) cfg.Option {
+func WithSelfSigned(cert, key string) Option {
 	certificate := x.Must(tls.LoadX509KeyPair(cert, key))
 
-	return func(config *cfg.Config) {
+	return func(config *Config) {
 		config.TLS = &tls.Config{
 			MinVersion:   tls.VersionTLS13,
 			Certificates: []tls.Certificate{certificate},