status-im/consul
2
0
Fork 0
mirror of https://github.com/status-im/consul.git synced 2025-01-11 06:16:08 +00:00
Code Issues Projects Releases Wiki Activity

Change ClientAddr to default to BindAddr when not present.

Browse Source 
With this change, it is now possible to only specify the `-bind` or
`bind_addr` attributes and get a functioning consul agent.
This commit is contained in:
Sean Chittenden 2017-03-04 20:41:15 -08:00
parent ed2e700ab9
commit beae5c6bba
No known key found for this signature in database
GPG Key ID: 4EBC9DC16C2E5E16
3 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
command/agent/command.go
View File

@ -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 // Ensure all endpoints are unique
if err := config.verifyUniqueListeners(); err != nil { if err := config.verifyUniqueListeners(); err != nil {
c.Ui.Error(fmt.Sprintf("All listening endpoints must be unique: %s", err)) c.Ui.Error(fmt.Sprintf("All listening endpoints must be unique: %s", err))

1
command/agent/config.go
View File

@ -742,7 +742,6 @@ func DefaultConfig() *Config {
Datacenter: consul.DefaultDC, Datacenter: consul.DefaultDC,
Domain: "consul.", Domain: "consul.",
LogLevel: "INFO", LogLevel: "INFO",
ClientAddr: "127.0.0.1",
BindAddr: "0.0.0.0", BindAddr: "0.0.0.0",
Ports: PortConfig{ Ports: PortConfig{
DNS: 8600, DNS: 8600,

13
website/source/docs/agent/options.html.markdown
View File

@ -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. [`-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 * <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, Consul will bind client interfaces, including the HTTP and DNS servers. When
this is "127.0.0.1", allowing only loopback connections. 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 * <a name="_config_file"></a><a href="#_config_file">`-config-file`</a> - A configuration file
to load. For more information on 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 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". 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 * <a name="client_addr"></a><a href="#client_addr">`client_addr`</a> Equivalent
[`-client` command-line flag](#_client). 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 * <a name="datacenter"></a><a href="#datacenter">`datacenter`</a> Equivalent to the
[`-datacenter` command-line flag](#_datacenter). [`-datacenter` command-line flag](#_datacenter).