github
/
consul
mirror of https://github.com/hashicorp/consul
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Adding documentation about specifying multiple configuration directories

pull/926/head
Cameron Ruatta 2015-05-11 10:19:04 -07:00
parent ecf43cf14e
commit 9271d94532
2 changed files with 4 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 -config-dir=foo Path to a directory to read configuration files
from. This will read every file ending in ".json" from. This will read every file ending in ".json"
as configuration in this directory in alphabetical 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 -data-dir=path Path to a data directory to store agent state
-recursor=1.2.3.4 Address of an upstream DNS server. -recursor=1.2.3.4 Address of an upstream DNS server.
Can be specified multiple times. Can be specified multiple times.

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

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