Rename bindaddr to just bind

config/directives.go

@@ -43,7 +43,7 @@ var directiveOrder = []directive{
 	// Essential directives that initialize vital configuration settings
 	{"root", setup.Root},
 	{"tls", setup.TLS},
-	{"bindaddr", setup.BindAddr},
+	{"bind", setup.BindHost},
 
 	// Other directives that don't create HTTP handlers
 	{"startup", setup.Startup},

config/setup/bindaddr.go → config/setup/bindhost.go

@@ -2,9 +2,9 @@ package setup
 
 import "github.com/mholt/caddy/middleware"
 
-func BindAddr(c *Controller) (middleware.Middleware, error) {
+func BindHost(c *Controller) (middleware.Middleware, error) {
 	for c.Next() {
-		if !c.Args(&c.BindAddress) {
+		if !c.Args(&c.BindHost) {
 			return nil, c.ArgErr()
 		}
 	}

server/config.go

@@ -11,8 +11,8 @@ type Config struct {
 	// The hostname or IP on which to serve
 	Host string
 
-	// The address to bind on - defaults to Host if empty
-	BindAddress string
+	// The host address to bind on - defaults to (virtual) Host if empty
+	BindHost string
 
 	// The port to listen on
 	Port string
@@ -47,8 +47,8 @@ type Config struct {
 
 // Address returns the host:port of c as a string.
 func (c Config) Address() string {
-	if c.BindAddress != "" {
-		return net.JoinHostPort(c.BindAddress, c.Port)
+	if c.BindHost != "" {
+		return net.JoinHostPort(c.BindHost, c.Port)
 	}
 	return net.JoinHostPort(c.Host, c.Port)
 }