From 75ec9482b7bde65e9569fdbf50d934c1d60ad55a Mon Sep 17 00:00:00 2001 From: Alan Pearce Date: Wed, 26 Jun 2024 18:48:18 +0200 Subject: default redirect to true --- fly.toml | 1 - internal/server/server.go | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/fly.toml b/fly.toml index 6bc1405..1194b67 100644 --- a/fly.toml +++ b/fly.toml @@ -16,7 +16,6 @@ primary_region = "ams" TLS = "true" ROOT = "/data" PRODUCTION = "true" - REDIRECT = "true" LOCAL_PATH = "/data/website" REMOTE_URL = "https://git.alanpearce.eu/website.git" diff --git a/internal/server/server.go b/internal/server/server.go index 9781364..3110ec0 100644 --- a/internal/server/server.go +++ b/internal/server/server.go @@ -33,7 +33,7 @@ var ( type Config struct { Development bool `conf:"default:false,flag:dev"` Root string `conf:"default:website"` - Redirect bool `conf:"default:false"` + Redirect bool `conf:"default:true"` ListenAddress string `conf:"default:localhost"` Port int `conf:"default:3000,short:p"` TLSPort int `conf:"default:443"` @@ -164,7 +164,7 @@ func New(runtimeConfig *Config) (*Server, error) { return nil, errors.Wrap(err, "could not create website mux") } - if runtimeConfig.Development || runtimeConfig.Redirect { + if runtimeConfig.Redirect { loggingMux.Handle(config.BaseURL.Hostname()+"/", mux) loggingMux.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) { newURL := config.BaseURL.JoinPath(r.URL.String()) -- cgit 1.4.1