change error_pages to be disabled by default

Author: tj

config/errorpages.go

@@ -2,8 +2,8 @@ package config
 
 // ErrorPages configuration.
 type ErrorPages struct {
-	// Disable default error pages.
-	Disable bool `json:"disable"`
+	// Enable error pages.
+	Enable bool `json:"enable"`
 
 	// Dir containing error pages.
 	Dir string `json:"dir"`

docs/04-configuration.md

@@ -296,9 +296,9 @@ Date: Mon, 31 Jul 2017 20:49:35 GMT
 
 ## Error pages
 
-By default Up will serve a minimalistic error page for requests accepting `text/html`. The following settings are available:
+When enabled Up will serve a minimalistic error page for requests accepting `text/html`. The following settings are available:
 
-- `disable` — remove the error page feature and default pages
+- `enable` — enable the error page feature
 - `dir` — the directory where the error pages are located
 - `variables` — vars available to the pages
 

http/errorpages/errorpages.go

@@ -84,16 +84,17 @@ func (r *response) Write(b []byte) (int, error) {
 
 // New error pages handler.
 func New(c *up.Config, next http.Handler) (http.Handler, error) {
+	// disabled
+	if !c.ErrorPages.Enable {
+		return next, nil
+	}
+
+	// load pages
 	pages, err := errorpage.Load(c.ErrorPages.Dir)
 	if err != nil {
 		return nil, errors.Wrap(err, "loading error pages")
 	}
 
-	// we always have one "default" page, but it can be disabled
-	if len(pages) == 1 && c.ErrorPages.Disable {
-		return next, nil
-	}
-
 	h := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		mime, _ := accept.Negotiate(r.Header.Get("Accept"), "text/html")
 

http/errorpages/errorpages_test.go

@@ -49,7 +49,12 @@ func TestErrors_templates(t *testing.T) {
 	os.Chdir("testdata/templates")
 	defer os.Chdir("../..")
 
-	c := &up.Config{Name: "app"}
+	c := &up.Config{
+		Name: "app",
+		ErrorPages: config.ErrorPages{
+			Enable: true,
+		},
+	}
 	assert.NoError(t, c.Default(), "default")
 	assert.NoError(t, c.Validate(), "validate")
 
@@ -60,7 +65,8 @@ func TestErrors_dir(t *testing.T) {
 	c := &up.Config{
 		Name: "app",
 		ErrorPages: config.ErrorPages{
-			Dir: "testdata/templates",
+			Dir:    "testdata/templates",
+			Enable: true,
 		},
 	}
 
@@ -74,7 +80,12 @@ func TestErrors_defaults(t *testing.T) {
 	os.Chdir("testdata/defaults")
 	defer os.Chdir("../..")
 
-	c := &up.Config{Name: "app"}
+	c := &up.Config{
+		Name: "app",
+		ErrorPages: config.ErrorPages{
+			Enable: true,
+		},
+	}
 	assert.NoError(t, c.Default(), "default")
 	assert.NoError(t, c.Validate(), "validate")
 
@@ -90,9 +101,6 @@ func TestErrors_defaults(t *testing.T) {
 func TestErrors_disabled(t *testing.T) {
 	c := &up.Config{
 		Name: "app",
-		ErrorPages: config.ErrorPages{
-			Disable: true,
-		},
 	}
 
 	assert.NoError(t, c.Default(), "default")

http/inject/inject_test.go

@@ -10,6 +10,7 @@ import (
 	"github.com/apex/up"
 	"github.com/tj/assert"
 
+	"github.com/apex/up/config"
 	"github.com/apex/up/http/errorpages"
 	"github.com/apex/up/http/static"
 	"github.com/apex/up/internal/inject"
@@ -21,6 +22,9 @@ func TestInject(t *testing.T) {
 
 	c := &up.Config{
 		Name: "app",
+		ErrorPages: config.ErrorPages{
+			Enable: true,
+		},
 		Inject: inject.Rules{
 			"head": []*inject.Rule{
 				{

internal/cli/deploy/deploy.go

@@ -110,7 +110,7 @@ retry:
 		"has_cors":             c.CORS != nil,
 		"has_logs":             !c.Logs.Disable,
 		"has_profile":          c.Profile != "",
-		"has_error_pages":      !c.ErrorPages.Disable,
+		"has_error_pages":      c.ErrorPages.Enable,
 		"app_name_hash":        util.Md5(c.Name),
 		"is_git":               commit.Author.Name != "",
 	})