147 Commits

Author SHA1 Message Date
Armon Dadgar
73eeb2566e Merge pull request #556 from darron/master
Docs: It's not key - it's service.
2015-01-02 21:54:53 +05:30
Thordur Bjornsson
5ef79e747e Revert "correct the doc for obtaining formatted json"
This reverts commit cf3b9ec4fee09075481fd5c521dd6c4b8db58e91.
2015-01-02 08:00:09 +01:00
darron froese
a5ba33ae06 It's not key - it's service.
It's right in the description, but the example seems to be wrong.
2014-12-26 21:51:48 -08:00
Michael H. Oshita
a03436e4b2 minor grammer fix 2014-12-11 19:02:29 +09:00
Dan Frost
284814a515 docs: agent/watches: minor fixes 2014-11-26 13:48:33 +00:00
Dan Frost
1b94c804f3 docs: agent/checks: minor fixes 2014-11-26 13:42:53 +00:00
Dan Frost
65ffbed02e docs: agent/dns: minor fixes 2014-11-26 13:33:55 +00:00
Dan Frost
3bbb226e2b docs: agent/basics: minor fixes 2014-11-26 13:15:41 +00:00
Ryan Uber
f126bb7381 website: Improve docs for reloading config. Fixes #407 2014-11-25 19:03:14 -08:00
Brandon Wilson
cf3b9ec4fe correct the doc for obtaining formatted json
was "?pretty" should be "?pretty=1"
2014-11-21 12:27:48 -08:00
Ryan Uber
ab5fbe4094 agent: ignore -encrypt if provided when keyring exists 2014-11-19 16:37:40 -08:00
Ryan Uber
80c25e3320 website: document new behavior of the -encrypt option 2014-11-19 16:36:01 -08:00
Ryan Uber
026ebcef58 website: remove keyring persistence options from agent page 2014-11-19 16:31:06 -08:00
Ryan Uber
cea2b49c15 website: update consul keys documentation 2014-11-19 16:30:22 -08:00
Armon Dadgar
6be29e17c2 Merge pull request #478 from amalaviy/https
Added HTTPS support via a new HTTPS Port configuration option
2014-11-19 11:17:10 -08:00
Atin Malaviya
0904c651a8 Change names to StartJoinWan, RetryJoinWan etc 2014-11-17 17:14:59 -05:00
Atin Malaviya
f4fd8453ed Added HTTPS support via a new HTTPS Port configuration option similar to the HTTP Port. 2014-11-17 14:29:35 -05:00
Atin Malaviya
5b41170f47 Add start-wan-join, retry-wan-join and related configuration options and commandline options 2014-11-14 10:56:39 -05:00
Ryan Uber
3facf1bdf4 website: better description of config merging in agent options. Closes #470 2014-11-13 12:04:09 -08:00
Danny Berger
3da9291ae1 Fix some typos in website docs 2014-11-04 21:33:42 -07:00
Armon Dadgar
cd936793ad Support old recursor config for backwards compatibility 2014-11-03 11:28:21 -08:00
Armon Dadgar
632bbcdd54 Merge pull request #448 from foostan/multiple_recursor
Add multiple recursor definition support
2014-11-03 11:18:37 -08:00
foostan
35b006d884 Add multiple recursor definition support 2014-11-01 04:26:26 +09:00
Laurent Raufaste
26916b03e6 Rephrase 2014-10-30 21:46:19 -04:00
Laurent Raufaste
33c0de708d ACL doc clarification
Fixes #443
2014-10-30 21:44:23 -04:00
Ryan Uber
d472825181 website: fix JSON in multiple checks documentation 2014-10-27 11:58:01 -07:00
Ryan Uber
f03bbb8daa website: update docs for multiple checks in config 2014-10-26 13:25:48 -07:00
Alexander Simmerl
461c1e18a5 Add multiple service definition support
This change-set adds another key to the configuration decoding called
`services`, which is expected to be a list of service definitions. It
follows the established convention of only allowing one of the keys:
`service`, `check`, `services`. For every entry in the list it calls
the corresponding decode method and appends it to the Servics of the
resulting Config.

While a similar result could be achieved with changing the Services
member of the Config struct to have named mapstruct tag it lacks the
proper time conversions provided by DecodeServiceDefinition.
2014-10-23 22:50:40 -04:00
Armon Dadgar
21c3e606a2 website: Fixing formatting 2014-10-23 17:14:40 -07:00
Armon Dadgar
c7d5330471 Merge pull request #427 from blalor/agent_http_links
website: Improve navigability of agent HTTP API categories
2014-10-23 16:46:58 -07:00
Ryan Uber
805a9f7ec2 website: document retry_join and retry_interval flags for config file 2014-10-23 16:40:49 -07:00
Brian Lalor
914db50a52 Add links for status endpoints 2014-10-23 07:59:58 -04:00
Brian Lalor
dd251dd323 Add links for event endpoints 2014-10-23 07:59:05 -04:00
Brian Lalor
f09d1b32c9 Add links for ACL endpoints 2014-10-23 07:57:55 -04:00
Brian Lalor
8d6b8f4309 Add links for session endpoints 2014-10-23 07:56:28 -04:00
Brian Lalor
03be420bce Add links for health endpoints 2014-10-23 07:54:46 -04:00
Brian Lalor
c7125bad12 Add links for catalog endpoints 2014-10-23 07:53:11 -04:00
Brian Lalor
98ebb94afa Add links for agent endpoints 2014-10-23 07:50:54 -04:00
Brian Lalor
351d722a15 Improve navigability of agent HTTP API categories 2014-10-23 07:44:20 -04:00
Leo Cassarani
64f710518f Fix spelling of "separator" in the HTTP API docs 2014-10-23 12:31:41 +01:00
Seth Vargo
869b194127 Use new Markdown syntaxes and add SEO descriptions 2014-10-19 19:42:13 -04:00
Seth Vargo
302789bf76 Use codeblocks for code 2014-10-19 19:41:11 -04:00
Armon Dadgar
bee5fe280c Merge pull request #396 from ryanuber/f-retry-join
agent: Retry failed joins on agent start
2014-10-13 10:46:10 -07:00
Ryan Uber
bec34b0c46 website: document retry join 2014-10-12 12:31:47 -07:00
Theo Hultberg
5560d2700b Fix mistake in the watches documentation 2014-10-11 17:04:52 +02:00
Alex Wheeler
bb613cf467 Added the dns_config option enable_truncate to the docs. 2014-09-30 15:31:28 -04:00
Armon Dadgar
6d4b8bbd56 website: fixing formatting 2014-09-24 16:59:43 -07:00
Sneha More
5d6391904a removed repeated 'can' 2014-09-18 11:11:00 +05:30
lalyos
29f933c554 json sample fixed for PUT /v1/acl/create 2014-09-06 01:55:38 +02:00
Armon Dadgar
feb3fa27fa website: Documenting new options 2014-09-02 14:36:25 -07:00