From beae5c6bba3eb1bf2868e49431f979fa270423e1 Mon Sep 17 00:00:00 2001
From: Sean Chittenden <sean@chittenden.org>
Date: Sat, 4 Mar 2017 20:41:15 -0800
Subject: [PATCH] Change `ClientAddr` to default to `BindAddr` when not
 present.

With this change, it is now possible to only specify the `-bind` or
`bind_addr` attributes and get a functioning consul agent.
---
 command/agent/command.go                        |  6 ++++++
 command/agent/config.go                         |  1 -
 website/source/docs/agent/options.html.markdown | 13 +++++++++----
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/command/agent/command.go b/command/agent/command.go
index 1ee73527c5..49f3fbd11e 100644
--- a/command/agent/command.go
+++ b/command/agent/command.go
@@ -264,6 +264,12 @@ func (c *Command) readConfig() *Config {
 		}
 	}
 
+	// If the client address is empty, default to using the value specified by the
+	// bind address.
+	if config.ClientAddr == "" {
+		config.ClientAddr = config.BindAddr
+	}
+
 	// Ensure all endpoints are unique
 	if err := config.verifyUniqueListeners(); err != nil {
 		c.Ui.Error(fmt.Sprintf("All listening endpoints must be unique: %s", err))
diff --git a/command/agent/config.go b/command/agent/config.go
index bd507628ca..a75cac18ac 100644
--- a/command/agent/config.go
+++ b/command/agent/config.go
@@ -742,7 +742,6 @@ func DefaultConfig() *Config {
 		Datacenter:      consul.DefaultDC,
 		Domain:          "consul.",
 		LogLevel:        "INFO",
-		ClientAddr:      "127.0.0.1",
 		BindAddr:        "0.0.0.0",
 		Ports: PortConfig{
 			DNS:     8600,
diff --git a/website/source/docs/agent/options.html.markdown b/website/source/docs/agent/options.html.markdown
index 591eaaf27c..46c4d9a747 100644
--- a/website/source/docs/agent/options.html.markdown
+++ b/website/source/docs/agent/options.html.markdown
@@ -115,8 +115,9 @@ will exit with an error at startup.
   [`-bind` command-line flag](#_bind), and if this is not specified, the `-bind` option is used. This is available in Consul 0.7.1 and later.
 
 * <a name="_client"></a><a href="#_client">`-client`</a> - The address to which
-  Consul will bind client interfaces, including the HTTP and DNS servers. By default,
-  this is "127.0.0.1", allowing only loopback connections.
+  Consul will bind client interfaces, including the HTTP and DNS servers. When
+  not specified, the default value is the same as
+  the [`_bind` command-line flag](#_bind) address.
 
 * <a name="_config_file"></a><a href="#_config_file">`-config-file`</a> - A configuration file
   to load. For more information on
@@ -586,8 +587,12 @@ Consul will not enable TLS for the HTTP API unless the `https` port has been ass
   reduce write pressure. If a check ever changes state, the new state and associated
   output is synchronized immediately. To disable this behavior, set the value to "0s".
 
-* <a name="client_addr"></a><a href="#client_addr">`client_addr`</a> Equivalent to the
-  [`-client` command-line flag](#_client).
+* <a name="client_addr"></a><a href="#client_addr">`client_addr`</a> Equivalent
+  to the [`-client` command-line flag](#_client).  When not specified, the
+  default value is the same as the [`bind_addr`](#bind_addr) address.  It is not
+  normally necessary to specify this value, however, may be necessary in more
+  complex setups where agents are NATed or when an agent is running in client
+  and server mode (common in development).
 
 * <a name="datacenter"></a><a href="#datacenter">`datacenter`</a> Equivalent to the
   [`-datacenter` command-line flag](#_datacenter).