Merge pull request #483 from benschumacher/master

letsencrypt: Make plaintext redirect hosts honor the Bind settings

caddy/directives.go

@@ -42,8 +42,8 @@ func init() {
 var directiveOrder = []directive{
 	// Essential directives that initialize vital configuration settings
 	{"root", setup.Root},
-	{"tls", setup.TLS}, // letsencrypt is set up just after tls
 	{"bind", setup.BindHost},
+	{"tls", setup.TLS}, // letsencrypt is set up just after tls
 
 	// Other directives that don't create HTTP handlers
 	{"startup", setup.Startup},

caddy/letsencrypt/letsencrypt.go

@@ -445,8 +445,9 @@ func redirPlaintextHost(cfg server.Config) server.Config {
 	}
 
 	return server.Config{
-		Host: cfg.Host,
-		Port: "http",
+		Host:     cfg.Host,
+		BindHost: cfg.BindHost,
+		Port:     "http",
 		Middleware: map[string][]middleware.Middleware{
 			"/": []middleware.Middleware{redirMidware},
 		},

caddy/letsencrypt/letsencrypt_test.go

@@ -38,14 +38,18 @@ func TestHostQualifies(t *testing.T) {
 
 func TestRedirPlaintextHost(t *testing.T) {
 	cfg := redirPlaintextHost(server.Config{
-		Host: "example.com",
-		Port: "http",
+		Host:     "example.com",
+		BindHost: "93.184.216.34",
+		Port:     "http",
 	})
 
 	// Check host and port
 	if actual, expected := cfg.Host, "example.com"; actual != expected {
 		t.Errorf("Expected redir config to have host %s but got %s", expected, actual)
 	}
+	if actual, expected := cfg.BindHost, "93.184.216.34"; actual != expected {
+		t.Errorf("Expected redir config to have bindhost %s but got %s", expected, actual)
+	}
 	if actual, expected := cfg.Port, "http"; actual != expected {
 		t.Errorf("Expected redir config to have port '%s' but got '%s'", expected, actual)
 	}