Commit Graph

147 Commits

Author SHA1 Message Date
Armon Dadgar daae47fefc 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 cb32b82b37 Revert "correct the doc for obtaining formatted json"
This reverts commit cf3b9ec4fee09075481fd5c521dd6c4b8db58e91.
2015-01-02 08:00:09 +01:00
darron froese ee834837b2 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 8351121fde minor grammer fix 2014-12-11 19:02:29 +09:00
Dan Frost bd5467c593 docs: agent/watches: minor fixes 2014-11-26 13:48:33 +00:00
Dan Frost bfd6c8aac0 docs: agent/checks: minor fixes 2014-11-26 13:42:53 +00:00
Dan Frost f0a2fa325a docs: agent/dns: minor fixes 2014-11-26 13:33:55 +00:00
Dan Frost e1a0845f5a docs: agent/basics: minor fixes 2014-11-26 13:15:41 +00:00
Ryan Uber 58ba650cb0 website: Improve docs for reloading config. Fixes #407 2014-11-25 19:03:14 -08:00
Brandon Wilson 22ad8172b8 correct the doc for obtaining formatted json
was "?pretty" should be "?pretty=1"
2014-11-21 12:27:48 -08:00
Ryan Uber 196cbd27b2 agent: ignore -encrypt if provided when keyring exists 2014-11-19 16:37:40 -08:00
Ryan Uber 9217e371bc website: document new behavior of the -encrypt option 2014-11-19 16:36:01 -08:00
Ryan Uber bb06d5ccb8 website: remove keyring persistence options from agent page 2014-11-19 16:31:06 -08:00
Ryan Uber d8f513f6d6 website: update consul keys documentation 2014-11-19 16:30:22 -08:00
Armon Dadgar dd41c69389 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 46178dbb37 Change names to StartJoinWan, RetryJoinWan etc 2014-11-17 17:14:59 -05:00
Atin Malaviya 59a68ecc26 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 df8d099f49 Add start-wan-join, retry-wan-join and related configuration options and commandline options 2014-11-14 10:56:39 -05:00
Ryan Uber c9de806ab9 website: better description of config merging in agent options. Closes #470 2014-11-13 12:04:09 -08:00
Danny Berger 4347b9394d Fix some typos in website docs 2014-11-04 21:33:42 -07:00
Armon Dadgar 982b177e69 Support old recursor config for backwards compatibility 2014-11-03 11:28:21 -08:00
Armon Dadgar 2c16fec0cc Merge pull request #448 from foostan/multiple_recursor
Add multiple recursor definition support
2014-11-03 11:18:37 -08:00
foostan 4d8f1c2133 Add multiple recursor definition support 2014-11-01 04:26:26 +09:00
Laurent Raufaste 7d01816c1f Rephrase 2014-10-30 21:46:19 -04:00
Laurent Raufaste 7a2a01f9de ACL doc clarification
Fixes #443
2014-10-30 21:44:23 -04:00
Ryan Uber c751a4ff5f website: fix JSON in multiple checks documentation 2014-10-27 11:58:01 -07:00
Ryan Uber 95fa599937 website: update docs for multiple checks in config 2014-10-26 13:25:48 -07:00
Alexander Simmerl ad4598959e 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 df43c42c94 website: Fixing formatting 2014-10-23 17:14:40 -07:00
Armon Dadgar 2b2f9980fb 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 d83053e8ab website: document retry_join and retry_interval flags for config file 2014-10-23 16:40:49 -07:00
Brian Lalor d2985d3c04 Add links for status endpoints 2014-10-23 07:59:58 -04:00
Brian Lalor 3082b3f95f Add links for event endpoints 2014-10-23 07:59:05 -04:00
Brian Lalor d45fdd15dd Add links for ACL endpoints 2014-10-23 07:57:55 -04:00
Brian Lalor 39e44c7968 Add links for session endpoints 2014-10-23 07:56:28 -04:00
Brian Lalor 9a29e1b60e Add links for health endpoints 2014-10-23 07:54:46 -04:00
Brian Lalor 4401fbf0e3 Add links for catalog endpoints 2014-10-23 07:53:11 -04:00
Brian Lalor 3ecb9ec8df Add links for agent endpoints 2014-10-23 07:50:54 -04:00
Brian Lalor 4ca29beec3 Improve navigability of agent HTTP API categories 2014-10-23 07:44:20 -04:00
Leo Cassarani d43a89fdd7 Fix spelling of "separator" in the HTTP API docs 2014-10-23 12:31:41 +01:00
Seth Vargo e265ea050d Use new Markdown syntaxes and add SEO descriptions 2014-10-19 19:42:13 -04:00
Seth Vargo e90f3ce442 Use codeblocks for code 2014-10-19 19:41:11 -04:00
Armon Dadgar 2c1add1c67 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 984ea76e6b website: document retry join 2014-10-12 12:31:47 -07:00
Theo Hultberg c78bd6db63 Fix mistake in the watches documentation 2014-10-11 17:04:52 +02:00
Alex Wheeler 5917aa0e20 Added the dns_config option enable_truncate to the docs. 2014-09-30 15:31:28 -04:00
Armon Dadgar 4037f7c41c website: fixing formatting 2014-09-24 16:59:43 -07:00
Sneha More baa08454be removed repeated 'can' 2014-09-18 11:11:00 +05:30
lalyos 430885595d json sample fixed for PUT /v1/acl/create 2014-09-06 01:55:38 +02:00
Armon Dadgar 8846068455 website: Documenting new options 2014-09-02 14:36:25 -07:00