diff --git a/acceptance_test.go b/acceptance_test.go index 87cd307cf43a01ceaceb221e5ece85ed0b5cc024..83f09cdf1991a5cd23e8cba01ab06bf2d71ebc8c 100644 --- a/acceptance_test.go +++ b/acceptance_test.go @@ -525,7 +525,7 @@ func TestDisabledRedirects(t *testing.T) { func TestRedirectStatusPage(t *testing.T) { skipUnlessEnabled(t) - teardown := RunPagesProcessWithEnvs(t, true, *pagesBinary, listeners, "", []string{"FF_ENABLE_REDIRECTS=true"}) + teardown := RunPagesProcess(t, *pagesBinary, listeners, "") defer teardown() rsp, err := GetPageFromListener(t, httpListener, "group.redirects.gitlab-example.com", "/project-redirects/_redirects") @@ -542,7 +542,7 @@ func TestRedirectStatusPage(t *testing.T) { func TestRedirect(t *testing.T) { skipUnlessEnabled(t) - teardown := RunPagesProcessWithEnvs(t, true, *pagesBinary, listeners, "", []string{"FF_ENABLE_REDIRECTS=true"}) + teardown := RunPagesProcess(t, *pagesBinary, listeners, "") defer teardown() // Test that serving a file still works with redirects enabled diff --git a/internal/serving/disk/reader.go b/internal/serving/disk/reader.go index 559d332c4d9f970832c873d5f24acabd9e8fa05f..6afe7947bdf829a94b4b65ce3d8de3f6fdf8b499 100644 --- a/internal/serving/disk/reader.go +++ b/internal/serving/disk/reader.go @@ -95,7 +95,7 @@ func (reader *Reader) tryFile(h serving.Handler) error { // Serve status of `_redirects` under `_redirects` // We check if the final resolved path is `_redirects` after symlink traversal if fullPath == redirects.ConfigFile { - if os.Getenv("FF_ENABLE_REDIRECTS") == "true" { + if os.Getenv("FF_ENABLE_REDIRECTS") != "false" { r := redirects.ParseRedirects(ctx, root) return reader.serveRedirectsStatus(h, r) } diff --git a/internal/serving/disk/serving.go b/internal/serving/disk/serving.go index bb9b40d2fde7328c7790a5075d63608439348ef6..11b1689e32f89810db4b4d4ed130cc2ec4c6d243 100644 --- a/internal/serving/disk/serving.go +++ b/internal/serving/disk/serving.go @@ -21,7 +21,7 @@ func (s *Disk) ServeFileHTTP(h serving.Handler) bool { return true } - if os.Getenv("FF_ENABLE_REDIRECTS") == "true" { + if os.Getenv("FF_ENABLE_REDIRECTS") != "false" { if s.reader.tryRedirects(h) == nil { return true }