Infrastructure/caddy
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-01-06 22:40:31 -05:00
Code Issues Activity

Rename bindaddr to just bind

Browse source
This commit is contained in:
Nimi Wariboko Jr 2015-05-04 22:58:08 -07:00
parent d3aedbeb9a
commit 46f7930787
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
config/directives.go
View file

@ -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},

4
config/setup/bindaddr.go → config/setup/bindhost.go
View file

@ -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()
}
}

8
server/config.go
View file

@ -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)
}