From f935a8a506c2b3f798a613e7d752a8a3cca8950b Mon Sep 17 00:00:00 2001 From: Johannes 'fish' Ziemke Date: Fri, 20 Mar 2015 15:22:13 +0100 Subject: [PATCH] Add -domain command line flag to agent This makes it possible to configure the domain on the command line additionally to the config file. --- command/agent/command.go | 1 + website/source/docs/agent/options.html.markdown | 9 ++++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/command/agent/command.go b/command/agent/command.go index dfc5483939..05caa7a3f7 100644 --- a/command/agent/command.go +++ b/command/agent/command.go @@ -75,6 +75,7 @@ func (c *Command) readConfig() *Config { cmdFlags.BoolVar(&cmdConfig.Server, "server", false, "run agent as server") cmdFlags.BoolVar(&cmdConfig.Bootstrap, "bootstrap", false, "enable server bootstrap mode") cmdFlags.IntVar(&cmdConfig.BootstrapExpect, "bootstrap-expect", 0, "enable automatic bootstrap via expect mode") + cmdFlags.StringVar(&cmdConfig.Domain, "domain", "", "domain to use for DNS interface") cmdFlags.StringVar(&cmdConfig.ClientAddr, "client", "", "address to bind client listeners to (DNS, HTTP, HTTPS, RPC)") cmdFlags.StringVar(&cmdConfig.BindAddr, "bind", "", "address to bind server listeners to") diff --git a/website/source/docs/agent/options.html.markdown b/website/source/docs/agent/options.html.markdown index d9729d4add..89444b26c9 100644 --- a/website/source/docs/agent/options.html.markdown +++ b/website/source/docs/agent/options.html.markdown @@ -112,6 +112,10 @@ The options below are all specified on the command-line. it relies on proper configuration. Nodes in the same datacenter should be on a single LAN. +* `-domain` - By default, Consul responds to DNS queries + in the "consul." domain. This flag can be used to change that domain. All queries in this domain + are assumed to be handled by Consul and will not be recursively resolved. + * `-encrypt` - Specifies the secret key to use for encryption of Consul network traffic. This key must be 16-bytes that are Base64-encoded. The @@ -405,9 +409,8 @@ definitions support being updated during a reload. nodes whose healthchecks are not passing will be excluded from DNS results. By default (or if set to false), only nodes whose healthchecks are failing as critical will be excluded. -* `domain` By default, Consul responds to DNS queries - in the "consul." domain. This flag can be used to change that domain. All queries in this domain - are assumed to be handled by Consul and will not be recursively resolved. +* `domain` Equivalent to the + [`-domain` command-line flag](#_domain). * `enable_debug` When set, enables some additional debugging features. Currently, this is only used to set the runtime profiling HTTP endpoints.