Merge branch 'main' into copilot/add-apple-signin-response-mode

Author: mattwoberts

app/cmd/server.go

@@ -50,7 +50,7 @@ func RunServer() int {
 	startJobs(ctx)
 
 	e := routes(web.New())
-	go e.Start(":" + env.Config.Port)
+	go e.Start(env.Config.Host + ":" + env.Config.Port)
 	return listenSignals(e)
 }
 

app/pkg/env/env.go

@@ -48,6 +48,7 @@ type config struct {
 		IdleTimeout  time.Duration `env:"HTTP_IDLE_TIMEOUT,default=120s,strict"`
 	}
 	Port                        string `env:"PORT,default=3000"`
+	Host                        string `env:"HOST,default="`
 	HostMode                    string `env:"HOST_MODE,default=single"`
 	HostDomain                  string `env:"HOST_DOMAIN"`
 	BaseURL                     string `env:"BASE_URL"`
@@ -66,6 +67,7 @@ type config struct {
 	Metrics struct {
 		Enabled bool   `env:"METRICS_ENABLED,default=false"`
 		Port    string `env:"METRICS_PORT,default=4000"`
+		Host    string `env:"METRICS_HOST,default="`
 	}
 	Database struct {
 		URL          string `env:"DATABASE_URL,required"`

app/pkg/web/engine.go

@@ -128,7 +128,7 @@ func (e *Engine) Start(address string) {
 	}
 
 	if env.Config.Metrics.Enabled {
-		metricsAddress := ":" + env.Config.Metrics.Port
+		metricsAddress := env.Config.Metrics.Host + ":" + env.Config.Metrics.Port
 		e.metricsServer = newMetricsServer(metricsAddress)
 		go func() {
 			err := e.metricsServer.ListenAndServe()