status-im/consul
2
0
Fork 0
mirror of https://github.com/status-im/consul.git synced 2025-02-25 20:05:24 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #926 from cruatta/multiple-config-dir-help-text

Browse Source 
Multiple config dir help text
This commit is contained in:
Ryan Breen 2015-05-11 13:41:55 -04:00
commit 9a2f04ea73
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
command/agent/command.go
View File

@ -895,7 +895,7 @@ Options:
-config-dir=foo Path to a directory to read configuration files
from. This will read every file ending in ".json"
as configuration in this directory in alphabetical
order.
order. This can be specified multiple times.
-data-dir=path Path to a data directory to store agent state
-recursor=1.2.3.4 Address of an upstream DNS server.
Can be specified multiple times.

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

@ -103,8 +103,10 @@ The options below are all specified on the command-line.
configuration files to load. Consul will
load all files in this directory with the suffix ".json". The load order
is alphabetical, and the the same merge routine is used as with the
[`config-file`](#_config_file) option above. For more information
on the format of the configuration files, see the [Configuration Files](#configuration_files) section.
[`config-file`](#_config_file) option above. This option can be specified mulitple times
to load multiple directories. Sub-directories of the config directory are not loaded.
For more information on the format of the configuration files, see the
[Configuration Files](#configuration_files) section.
* <a name="_data_dir"></a><a href="#_data_dir">`-data-dir`</a> - This flag provides
a data directory for the agent to store state.