all repos — website @ e19e9de02f4e0bf5b266f467fc67a0eebc6d3f62

My website

enable overriding base URL

Alan Pearce
commit

e19e9de02f4e0bf5b266f467fc67a0eebc6d3f62

parent

3674f74cbf1e3289303487e086adfff8f1f15cfa

1 file changed, 10 insertions(+), 4 deletions(-)

changed files
M internal/server/server.gointernal/server/server.go
@@ -5,6 +5,7 @@ "context"
"fmt" "net" "net/http" + "net/url" "os" "slices" "time"
@@ -38,9 +39,15 @@ type Server struct {
*http.Server } -func applyDevModeOverrides(config *cfg.Config) { +func applyDevModeOverrides(config *cfg.Config, listenAddress string) { config.CSP.ScriptSrc = slices.Insert(config.CSP.ScriptSrc, 0, "'unsafe-inline'") config.CSP.ConnectSrc = slices.Insert(config.CSP.ConnectSrc, 0, "'self'") + config.BaseURL = cfg.URL{ + URL: &url.URL{ + Scheme: "http", + Host: listenAddress, + }, + } } func serverHeaderHandler(wrappedHandler http.Handler) http.Handler {
@@ -56,15 +63,14 @@ config, err := cfg.GetConfig()
if err != nil { return nil, errors.WithMessage(err, "error parsing configuration file") } - if runtimeConfig.InDevServer { - applyDevModeOverrides(config) - } listenAddress := net.JoinHostPort(runtimeConfig.ListenAddress, runtimeConfig.Port) env := "development" if runtimeConfig.Production { env = "production" + } else { + applyDevModeOverrides(config, listenAddress) } err = sentry.Init(sentry.ClientOptions{ EnableTracing: true,