luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

Merge pull request #4351 from hashicorp/doc-config-dir-reads-hcl-files 

Notes that both "hcl" and "json" files are loaded from the config-dir.
This commit is contained in:
Paul Banks 2018-07-09 14:43:55 +01:00 committed by GitHub
parent aa1c0e04f8 cc24a65d45
commit 488c147ade
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
website/source/docs/agent/options.html.md
View File

@ -136,7 +136,7 @@ will exit with an error at startup.
* <a name="_config_dir"></a><a href="#_config_dir">`-config-dir`</a> - A directory of
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" or ".hcl". The load order
is alphabetical, and the the same merge routine is used as with the
[`config-file`](#_config_file) option above. This option can be specified multiple times
to load multiple directories. Sub-directories of the config directory are not loaded.