Merge branch '24-redirects-by-default' into 'master'

Enable redirects by default

See merge request gitlab-org/gitlab-pages!367

3 files changed, 4 insertions, 4 deletions

diff --git a/acceptance_test.go b/acceptance_test.go
index 87cd307c..83f09cdf 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 559d332c..6afe7947 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 bb9b40d2..11b1689e 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
 		}