Commit Graph

1781 Commits

Author SHA1 Message Date
Katie Bayes 4fe8375a65 update middleman version from 25 to 26 2017-06-06 20:12:32 -04:00
Frank Schröder e206ab5cb6 agent: support custom header and method for http checks (#3106)
This patch adds support for custom headers and
method for HTTP checks.

Fixes #2474
Fixes #2657
Fixes #3106
2017-06-07 01:11:56 +02:00
Katie Bayes 8e914975a3 update middleman version 2017-06-06 16:00:11 -04:00
Katie Bayes 714f46f34b add enterprise badge style alert boxes, change guides/areas.html.md to erb file 2017-06-04 01:30:21 -04:00
Kyle Havlovitz e196576c07 Add settings for upshifting to encrypted gossip (#3079) 2017-05-30 08:51:37 -07:00
Michael Leow ec81c18006
agent: add RetryJoin support for Azure
Pull #2978 from leowmjw/develop

Resolves #2978
2017-05-24 10:15:38 +02:00
Scott Pynn ad60a369f8 Spelling Error
`Sample Respons` should be `Sample Response`.
2017-05-19 15:15:27 -04:00
Frank Schroeder 2391e8e98a
website: rename *.markdown to *.md 2017-05-17 20:25:45 +02:00
Frank Schroeder 00857245c4
website: fix typo 2017-05-17 20:22:00 +02:00
Frank Schroeder 9f4286b1ce
agent: support custom check id and name
This patch adds support for a custom check id and name when
registering a service.

This is achieved by adding a CheckID and a Name field to the
CheckType structure which is used to register checks with a
service and when returning health check definitions.

CheckDefinition is a superset of CheckType which duplicates
some of the fields of CheckType. This patch decouples these
two structures by removing the embedding of CheckType in
CheckDefinition.

Fixes #3047
2017-05-17 20:17:08 +02:00
James Phillips 8088555d69
Bumps website download link to 0.8.3. 2017-05-12 08:17:56 -07:00
Kyle Havlovitz e4af6583f5 Add a path for transitioning to TLS on an existing cluster (#3001)
Fixes #1705
2017-05-10 14:25:48 -07:00
James Phillips 4a0a8a94dd
Bumps Consul version to 0.8.2. 2017-05-09 07:19:02 -07:00
James Phillips 21d9d984fa
Adds prepared query API to ACLs table. 2017-05-08 21:37:52 -07:00
James Phillips 62cee1b013 Merge pull request #3008 from hashicorp/d-index-enterprise-features
Add Consul Enterprise section to Docs
2017-05-08 21:15:21 -07:00
Justin Walz bf31ca68bf Fixup ACL docs 2017-05-06 17:21:13 -07:00
Rob Genova ed8e2a05bc use relative links; remove extra spaces between words 2017-05-06 20:26:30 +00:00
James Phillips d087748e2d Merge pull request #3012 from hashicorp/jbs-2944
DOCS: Minor clarification to address #2944
2017-05-05 09:01:32 -07:00
Brian Shumate a4f1f9ef40
DOCS: Minor clarification to address #2944 2017-05-05 11:56:12 -04:00
Brian Shumate a1850b789d
DOCS: minor clarification to address #2950 2017-05-05 11:51:46 -04:00
Frank Schroeder 927335c045
Fix imports on website 2017-05-05 17:07:02 +02:00
Rob Genova 3ecaa4e499 Eliminated 'consul' from all paths; misc. edits; wrap text at 80 characters 2017-05-05 05:24:04 +00:00
Rob Genova 270391b4b3 Add Consul Enterprise section to Docs 2017-05-04 22:30:11 +00:00
James Phillips d567a9b53d
Adds support for new-style peers.json recovery for newer Raft protocol versions. 2017-05-04 14:15:59 -07:00
Kostis Kapelonis a55e6c08b4 Added Spring Consul SDK for Spring applications 2017-05-03 09:22:41 +02:00
Seth Vargo b162410b36 Merge pull request #2976 from jk563/master
Rearranged into alphabetical order
2017-05-01 14:55:35 -07:00
Kyle Havlovitz b5ed2ba536 Add separate option for verifying incoming HTTPS traffic (#2974)
* Add separate option for verifying incoming HTTPS traffic
2017-04-28 16:15:55 -07:00
Frank Schroeder 2bf668b658 api: Add ServiceTags to Health state endpoint (#153)
This patch adds the ServiceTags to the /v1/health/state/<state>
endpoint.

Fixes #153
2017-04-28 15:00:08 -07:00
Jamie Kelly 8831a8a4c7 Rearranged into alphabetical order
Swapped a couple of the guides around in the index page so that
they are in alphabetical order and match the navigation order.
2017-04-28 07:04:38 +01:00
rcgenova 63842b1e09 Merge pull request #2964 from hashicorp/d-remove-atlas-references
Remove references to the deprecated Consul/Atlas integration
2017-04-27 08:32:09 -07:00
James Phillips f03871cfd2 Merge pull request #2965 from amorken/docfix-query
(Website doc fix, trivial) Prepared query creation uses POST, not PUT
2017-04-27 06:40:03 -07:00
Kyle Havlovitz 42cf797ad9 Add TLS cipher suite options and CA path support (#2963)
This patch adds options to configure the available
TLS cipher suites and adds support for a path
for multiple CA certificates.

Fixes #2959
2017-04-27 01:29:39 -07:00
Anders Daljord Morken 436a188fc7 Prepared query creation uses POST, not PUT 2017-04-27 10:29:03 +02:00
Rob Genova c640ef11c4 add link to Consul Enterprise page 2017-04-26 22:45:12 +00:00
Rob Genova cb285879bf Remove references to the deprecated Consul/Atlas integration 2017-04-26 22:24:24 +00:00
Patrick Winter 9062bb1981 fixed typo 2017-04-26 10:09:02 +02:00
Kristiyan Nikolov c30ac1c14d Docs: fix typo (#2951) 2017-04-25 07:08:46 -07:00
Ruslan Sennov ac9bcceecd link to vertx-consul-client (#2937)
Signed-off-by: Ruslan Sennov <ruslan.sennov@gmail.com>
2017-04-21 00:43:15 -07:00
Frank Schröder 5f0a967507 Issue #2905: Add check-not-exists to TXN endpoint
This patch adds support for asserting that a given
key does not exist in the KV store.

Fixes #2905
2017-04-20 17:50:52 -07:00
Kyle Havlovitz 72ee7c2501 Show raft protocol in list-peers command (#2929) 2017-04-19 15:01:40 -07:00
Nic Jackson 90e3ef7b86
Updated autopilot guide to correct synax issue with example config 2017-04-19 17:15:12 +01:00
Kyle Havlovitz f09713f16c
Add a config example to autopilot guide 2017-04-18 14:40:20 -07:00
Seth Vargo 34e1de1b8b
Fix terminal a bit 2017-04-18 13:52:04 -04:00
Seth Vargo ffd7c3539a
Fix terminal a bit 2017-04-18 13:51:46 -04:00
Seth Vargo 647ad1441d
Use HashiCorp logo for jsonld 2017-04-18 13:19:00 -04:00
Seth Vargo a7a93a1a45
Fix homepage css 2017-04-18 12:57:05 -04:00
Frank Schröder 892fa89399 Add datacenter to catalog node API (#2917)
This patch stores the datacenter of a node in memdb
and exposes it via the API in all places where a Node
structure is returned.

 * /catalog/nodes
 * /catalog/node/:node
 * /catalog/service/:service
 * /health/service/:service
 * /query/:uuid/execute
2017-04-18 05:02:24 -07:00
Dan O'Brien 612756d1bc Docs: fix typo 2017-04-17 21:29:18 -04:00
mckennajones 703bb52369
Updating documentation regarding webui flags 2017-04-17 17:29:14 -07:00
Borys Pierov 74444bca8e ACL guide fixes 2017-04-17 17:59:03 -04:00
James Phillips 59abb5630e
Bumps download link to 0.8.1. 2017-04-17 11:14:48 -07:00
Kyle Havlovitz cdd8b5b880
Add tls client options to api/cli 2017-04-14 13:37:29 -07:00
James Phillips 502f9a4996
Tweaks 404 message. 2017-04-14 09:00:59 -07:00
James Phillips a24228d34a
Fixes broken link to network areas API. 2017-04-13 19:19:42 -07:00
James Phillips 74958a8a8d
Removes old Atlas ecosystem doc from Consul. 2017-04-13 17:39:32 -07:00
James Phillips a55e074a33 Merge pull request #2910 from hashicorp/jbs-2867
Docs: update bootstrapping and config, fixes #2867
2017-04-13 12:26:27 -07:00
Brian Shumate a9d9c43110
Put back manual process steps 2017-04-13 15:20:02 -04:00
James Phillips 86a69e8207 Merge pull request #2904 from hashicorp/non-host-id
Adds a new -disable-host-node-id option to help when testing with containers.
2017-04-13 10:49:05 -07:00
James Phillips bc6873b66d Merge pull request #2909 from hashicorp/consul-color
consuls color was reverted to incorrect
2017-04-13 10:07:46 -07:00
Brian Shumate 35f16d888f
Docs: update bootstrapping and config, fixes #2867
- Add various join options to bootstrapping guide
- Add note about Atlas deprecation to bootstrapping guide
- Add notes about -retry-join and retry_join to -join option
- Add notes about -retry-join and retry_join to start_join option
2017-04-13 13:03:26 -04:00
captainill fd71b78627 consuls color was reverted to incorrect color. Rename to red 2017-04-13 09:22:32 -07:00
James Phillips 20bf47d2b4
Adds a new -disable-host-node-id option to help when testing with containers.
Fixes #2877.
2017-04-12 22:07:18 -07:00
Ben Fradet 10fddd11e4 scala-consul -> helm 2017-04-12 09:35:07 +01:00
James Phillips e4feb77282 Merge pull request #2869 from liozN/master
Added jenkins consul plugin
2017-04-11 23:04:07 -07:00
James Phillips 01ef2b4993 Merge pull request #2885 from schalkwijk/clickable-homepage-cta
Make READ THE INTRODUCTION button on homepage clickable
2017-04-11 22:10:37 -07:00
James Phillips 37dcc0ac22 Adds a note about upgrading the current leader last. 2017-04-11 10:50:56 -07:00
James Phillips 03328e59d6 Merge pull request #2887 from devopsrebels/master
Fix wrong option name in options.html.markdown
2017-04-11 09:40:16 -07:00
Brian Shumate b9f048614b
Address link issues / add GCE 2017-04-11 12:34:40 -04:00
Brian Shumate cbff0c0250
add new FAQ details 2017-04-11 12:06:18 -04:00
Brian Shumate 09f7bc4036
Docs updates:
- Add a FAQ for per-key value size limitation in the KV
- Update Atlas FAQ with post-deprecation recommendations
2017-04-11 11:45:29 -04:00
Cihat Genc 13037fc139 Fix wrong option name in options.html.markdown 2017-04-11 14:58:15 +02:00
Samuel Lopes 5c5c568bf5 Make READ THE INTRODUCTION button on homepage clickable
The "call to action" button at the bottom of the homepage is currently unclickable, since it has a negative top margin and is thus "hidden" behind the bottom margin of the terminal div above it. I opted to remove the negative top margin and instead diminish the bottom margin of the terminal div. This approach ends up adding a bit more padding between the "DNS Query Interface" h2 and the marketing div above it, but I think overall the look is in-line with the aesthetics of the page.

I'm fairly unfamiliar with HTML / CSS, so if there is a better way to do what I've done, I'd love to hear it. I've tested this in Chrome and Safari.
2017-04-10 20:32:46 -05:00
Cameron Stokes af1d22135a [docs] Autopilot guide: clarify left status 2017-04-10 11:18:54 -07:00
Seth Vargo 04ab7ce040
Import fonts 2017-04-06 18:41:12 -04:00
Seth Vargo 932869a235
Update variables 2017-04-06 18:17:04 -04:00
Seth Vargo 9c72544447
Update font 2017-04-06 18:05:31 -04:00
Seth Vargo 64a76ea69f
Use hashicorp logo 2017-04-06 17:18:46 -04:00
Seth Vargo 3b66c5224c
Add press-kit 2017-04-06 17:11:34 -04:00
James Phillips 5fa71eda84
Cleans up some typos in the ACL Guide. 2017-04-06 08:05:17 -07:00
James Phillips 72b9ae96f5
Fixes deep link on ACL bounce page. 2017-04-06 07:55:23 -07:00
James Phillips 593d495624 Merge pull request #2876 from hashicorp/enterprise-links
update all links to enterprise to avoid redirect
2017-04-05 13:02:29 -07:00
Seth Vargo 3efd31be55
Add open graph images 2017-04-05 15:57:14 -04:00
captainill 9d2c13341b update all links to enterprise to avoid redirect 2017-04-05 12:13:23 -07:00
Seth Vargo 05bb6dff72 Merge pull request #2875 from hashicorp/consul-color
correct consul brand colors
2017-04-05 15:02:41 -04:00
Seth Vargo 51ea4faa83 Capitalze 2017-04-05 15:02:31 -04:00
captainill b80aedad6e correct consul brand colors 2017-04-05 12:00:35 -07:00
James Phillips 8967fad448
Removed RPC link from the sidebar. 2017-04-05 11:51:52 -07:00
James Phillips 3a81726023
Fixes a broken link. 2017-04-05 10:50:35 -07:00
James Phillips 28fd8a1904
Updates download link to 0.8.0. 2017-04-05 10:42:00 -07:00
James Phillips ac6bf5dbf0
Cleans up some doc typos. 2017-04-05 10:40:30 -07:00
James Phillips 0de8f13a97 Merge pull request #2874 from hashicorp/acl-guide
Updates the ACL guide.
2017-04-05 10:37:48 -07:00
James Phillips 217d304619
Does a complete rework of the ACL guide. 2017-04-05 10:36:19 -07:00
Seth Vargo 7a0dbe10a4
Wider column sidebar 2017-04-05 10:04:06 -04:00
James Phillips 686ddd8c83
Deprecates the ACLs internals doc in favor of a guide. 2017-04-04 18:56:42 -07:00
James Phillips 649cb4f385
Removes guide link for Atlas integration. 2017-04-04 18:55:09 -07:00
James Phillips ed7a6526e9 Merge pull request #2865 from moofish32/doc/v8-compatibility
Raft Protocol vs Consul Protocol Doc Clarification
2017-04-04 12:44:36 -07:00
James Phillips 13e0ecda3f Update upgrade-specific.html.markdown 2017-04-04 12:43:24 -07:00
Seth Vargo b3cd9acdae
Link to new api 2017-04-04 12:52:00 -04:00
Seth Vargo 5ee03a0d0e
Tabs v spaces 2017-04-04 12:45:08 -04:00
Seth Vargo bb080541a6
Rename sidebar link items 2017-04-04 12:40:53 -04:00
Seth Vargo 018d167bca
Add Makefile target for compiling entire website 2017-04-04 12:33:35 -04:00
Seth Vargo b0bb01d5da
Update API docs 2017-04-04 12:33:35 -04:00
Lioz Nudel 291d3b0e6d Added jenkins consul plugin 2017-04-04 17:01:13 +03:00
Mike Cowgill 75fdad1e54 Raft version in 0.8 is 3 2017-04-04 00:20:29 -07:00
Mike Cowgill 3c6ad0e430 compatibility table update and note about Raft version being separate 2017-04-04 00:17:49 -07:00
James Phillips e9c53e6b89
Changes title to Server Read Scaling. 2017-04-03 12:51:00 -07:00
James Phillips 3dac92cc97 Adds top-level guide links that were missing. 2017-03-31 09:06:24 -07:00
James Phillips 10fc02d362 Merge pull request #2862 from wjimenez5271/wjimenez5271-docs
clarify when acl_default_policy takes effect
2017-03-31 08:49:23 -07:00
Seth Vargo 6d9995b6e3
Fix GitHub link 2017-03-30 19:24:08 -04:00
Seth Vargo b8533888bb
Fix enterprise link 2017-03-30 19:17:26 -04:00
Seth Vargo b0ffcd9e00
Remove app init 2017-03-30 19:10:00 -04:00
Seth Vargo 55281ac728
Move to new branding
This JUST moves over to the new branding. Once we get this in, I can
work on making the sidebar links and splitting out the API into its own
section.
2017-03-30 18:46:50 -04:00
Brian Shumate 77dc61ace9
docs: Clarify force-remove limited to same DC, fixes #1264 2017-03-30 14:44:10 -04:00
Brian Shumate ca68cdb572
docs: Configuration precedence clarification, fixes #1203 2017-03-30 14:13:50 -04:00
Brian Shumate 6d5c61921e
docs: add user resource limits FAQ, fixes #1628 2017-03-30 13:56:03 -04:00
James Phillips c7f7e969d7 Merge pull request #2854 from hashicorp/remote-exec
Changes `disable_remote_exec` default to true so remote exec is opt-in.
2017-03-30 10:29:09 -07:00
Kyle Havlovitz 074b8576a5 Merge pull request #2847 from hashicorp/remove-peer-by-id
Add CLI/API endpoints for removing peer by ID
2017-03-30 10:13:56 -07:00
Kyle Havlovitz a2058d23ef
Add CLI/API endpoints for removing peer by ID 2017-03-30 10:13:32 -07:00
James Phillips ac90110396
Changes `disable_remote_exec` default to true so remote exec is opt-in. 2017-03-30 09:43:32 -07:00
James Phillips c4e6655757
Adds a link from the autopilot CLI page to the guide. 2017-03-29 21:14:26 -07:00
James Phillips f93e758650
Updates change log and upgrade guide with details about #2844. 2017-03-29 13:05:57 -07:00
James Phillips 4259ecd8bc
Disables agent-level enforcement on Consul agents unless acl_datacenter is set. 2017-03-29 12:24:42 -07:00
James Phillips 75b8ff44e3
Capitalizes title. 2017-03-29 11:32:56 -07:00
James Phillips 44b6d36995
Adds which DC each command runs in and a DNS example to the areas guide. 2017-03-29 11:30:05 -07:00
Kyle Havlovitz 15b60b07f0 Merge pull request #2840 from hashicorp/f-advanced-autopilot-guide
Add section on advanced autopilot features to the guide
2017-03-28 12:06:51 -07:00
James Phillips bbaa3f29d5 Merge pull request #2839 from hashicorp/network-area-docs
Adds network area docs.
2017-03-28 11:57:57 -07:00
James Phillips 42c8907fa6
Adds network areas guide. 2017-03-28 11:56:55 -07:00
Kyle Havlovitz 4f9a57cda3
Add section on advanced autopilot features to the guide 2017-03-28 11:56:21 -07:00
James Phillips 36aface2e2
Adds network area CLI documentation. 2017-03-28 10:31:56 -07:00
James Phillips 12e20ddfa9
Adds basic operator area HTTP documentation. 2017-03-28 01:09:20 -07:00
Thomas Viaud 6cb9269fb5 Update autopilot.html.markdown 2017-03-28 09:54:36 +02:00
James Phillips 086912d800
Breaks the operator HTTP doc into sections. 2017-03-27 23:28:08 -07:00
VEBER Arnaud d4a7e75246
docs(agent/options): remove atlas_endpoint dup 2017-03-25 13:25:54 +01:00
James Phillips b0352bb3d1 Update upgrade-specific.html.markdown 2017-03-24 17:45:24 -07:00
James Phillips 7c2509f407
Adds node metadata to the reload list. 2017-03-24 10:29:39 -07:00
James Phillips 7be075f1f1
Adds a note about the deprecated RPC ports. 2017-03-24 10:23:45 -07:00
James Phillips 69d4990a17
Adds an Enterprise link to the Consul top nav. 2017-03-24 09:28:20 -07:00
James Phillips 8b5cc2de81 Merge pull request #2826 from hashicorp/acl-cleanup
Cleans up reconcile issues with ACLs and reverting node information.
2017-03-23 15:56:14 -07:00
James Phillips 16a9f6d671
Modifies server reconcile path to not use the server's token for internal operations. 2017-03-23 13:34:30 -07:00
Brian Shumate 8163a480cb
docs: Point of clarifcation about cluster leadership for #2782 2017-03-23 13:00:23 -04:00
Kyle Havlovitz 37ea20cb44
Add advanced autopilot features 2017-03-22 15:25:16 -07:00
James Phillips 28f8aa5559
Removes remoteConsuls in favor of the new router.
This has the next wave of RTT integration with the router and also
factors some common RTT-related helpers out to lib. While we were
in here we also got rid of the coordinate disable config so we don't
need to deal with the complexity in the router (there was never a
user-visible way to disable coordinates).
2017-03-16 16:42:19 -07:00
James Phillips 82b6fbd844
Adds router into RPC paths with work in progress on coordinates. 2017-03-16 16:42:18 -07:00
Kyle Havlovitz 006c6b93b3 Merge pull request #2802 from hashicorp/f-autopilot-improvements
Fix an issue with changing server ID when re-joining
2017-03-15 20:26:16 -07:00
Kyle Havlovitz bc0494e396
Reorganized cluster health check loop and logic 2017-03-15 18:27:17 -07:00
Kyle Havlovitz c40279e012
Fix an issue with changing server IDs and add a few UX enhancements around autopilot features 2017-03-15 16:09:55 -07:00
Nic Jackson 414ac8bf7b Updated documentation to add information that bootstrap overrides server mode 2017-03-14 17:56:33 -07:00
Kyle Havlovitz f5050cce58
Adjust autopilot sections based on feedback 2017-03-10 15:22:20 -08:00
Kyle Havlovitz 3c6bece859
Add autopilot guide to the docs 2017-03-10 14:55:18 -08:00
Kyle Havlovitz 4807215fa1 Merge pull request #2788 from hashicorp/f-autopilot-2
Autopilot server health monitoring
2017-03-10 12:29:45 -08:00
Kyle Havlovitz 8130f9b1c1
Cleaned up and reorganized some autopilot-related code 2017-03-09 18:21:40 -08:00
James Phillips 0cb637927c
Adds back the RPC page with a deprecation notice.
Fixes #2794.
2017-03-09 11:09:11 -08:00
James Phillips 61ea6faf6c Fixes a typo in the snapshot docs. 2017-03-08 19:49:07 -08:00
Jack Pearkes a530f43e0f website: middleman-hashicorp bump to 0.3.13 2017-03-08 16:37:58 -08:00
Jason Costello b3970914f8 Small optical adjustment to center Jumbotron logo mark 2017-03-08 16:36:38 -08:00
Jason Costello 6ead80aebb Fix font-scoping 2017-03-08 16:36:38 -08:00
Jason Costello 6fa6fcc865 Update middleman-hashicorp to 0.3.11 2017-03-08 16:36:38 -08:00
Jason Costello bed54f332f Remove 'by hashicorp" 2017-03-08 16:36:30 -08:00
Jason Costello cb2dd2a907 Remove announcement banner 2017-03-08 16:36:30 -08:00
Jason Costello 2de9f8a80b Update middleman-hashicorp 2017-03-08 16:36:30 -08:00
Jason Costello fd05c1826c Add meganav 2017-03-08 16:35:02 -08:00
Jason Costello 6ea7665451 Remove unnecessary font 2017-03-08 16:34:26 -08:00
Seth Vargo 984cddff9a
Update license 2017-03-08 11:40:06 -08:00
Seth Vargo 217441a94a
Update license 2017-03-08 11:37:33 -08:00
Seth Vargo d29694e253
Update middleman-hashicorp 2017-03-08 11:26:11 -08:00
Kyle Havlovitz 0606133b75
Merge branch 'master' into f-autopilot-2 2017-03-06 16:02:19 -08:00
Kyle Havlovitz 8bcab6c6d7
Add autopilot server health tracking
This adds two goroutines to perform autopilot tasks on the leader - one
to monitor the health of servers and another to periodically clean up
dead servers with a limit on removal count. Also adds a new http endpoint,
`/v1/operator/autopilot/health`, for querying this information through an
operator RPC endpoint.
2017-03-06 16:00:10 -08:00
Sean Chittenden c6feba6ab7 Revert "Change `ClientAddr` to default to `BindAddr` when not present." 2017-03-06 13:32:43 -08:00
Sean Chittenden 17ccae59f4
Note the default value prior to 0.8 for `-client` was `127.0.0.1`. 2017-03-06 12:26:35 -08:00
Sean Chittenden e1ced1de30
Change `ClientAddr` to default to `BindAddr` when not present.
With this change, it is now possible to only specify the `-bind` or
`bind_addr` attributes and get a functioning consul agent.
2017-03-04 20:52:52 -08:00
James Phillips 233795704c Moves raft_protocol config out into its own top-level item. 2017-03-04 09:20:23 -08:00
James Phillips aba567273e Merge pull request #2690 from zeroae/f-simple-rfc2782
RFC 2782 support with optional .service tag
2017-03-02 14:49:36 -08:00
Seth Vargo d2e8eccbc3
Re-enable soft purging, stale-if-error 2017-03-01 12:37:48 -05:00
Kyle Havlovitz 44f0b08db7 Merge pull request #2771 from hashicorp/f-autopilot
Autopilot dead server cleanup, config, and raft version compatibility
2017-02-28 15:04:16 -08:00
Kyle Havlovitz 77785778bf Merge pull request #2774 from hashicorp/f-cli-deprecation-docs
Add CLI RPC deprecation section to docs
2017-02-28 14:59:48 -08:00
Kyle Havlovitz 23c492a74e
Rename DeadServerCleanup and make wording adjustments 2017-02-28 14:45:21 -08:00
Kyle Havlovitz 3b67c50c1d
Remove the RPC client interface and update docs 2017-02-28 13:41:09 -08:00
Seth Vargo 28a7d0bd67
Cache for a longer time on Fastly 2017-02-28 15:59:01 -05:00
Kyle Havlovitz 308f5c4782
Add CLI RPC deprecation notice to docs 2017-02-24 18:10:46 -08:00
Kyle Havlovitz f7b6d776f4
Add cli docs and minor test/comment tweaks 2017-02-24 16:55:44 -08:00
Kyle Havlovitz 459e72b011
Merge branch 'master' into f-autopilot 2017-02-24 15:55:18 -08:00
Kyle Havlovitz 7d514a7ef6
Add docs and api client methods for autopilot config 2017-02-23 21:00:15 -08:00
Kyle Havlovitz af1bc4fa27
Add config section to docs for autopilot 2017-02-22 13:11:01 -08:00
Jason Costello da2602def1 Mobile tweak 2017-02-21 16:31:17 -08:00
Jason Costello 0d5902b767 Docs typographic tweaks 2017-02-21 16:23:23 -08:00
Jason Costello e5667f583d Remove redundant declarations 2017-02-21 16:07:57 -08:00
Jason Costello 16162c0411 Beef up lead paragraph in Jumbotron 2017-02-21 15:57:24 -08:00
Jason Costello 1f6be611c4 Adjustments to <a>, and general letter-spacing 2017-02-21 15:57:05 -08:00
Jason Costello 9fc594bbf1 Improved mono declaration scope 2017-02-21 15:34:59 -08:00
Jason Costello 0c87077287 Update logo, remove old assets 2017-02-21 15:31:39 -08:00
Jason Costello 72d666acaf Various adjustments 2017-02-21 15:11:57 -08:00
Jason Costello f1a74ad675 Remove refs to Museo 2017-02-21 14:37:51 -08:00
Jason Costello 9b9855f138 Wire up Klavika, remove Museo declarations 2017-02-21 10:45:56 -08:00
Ellery Addington-White 17b9f3346d Adds missing double quote 2017-02-16 13:38:55 -08:00
Kyle Havlovitz 29a2061d44 Merge pull request #2748 from hashicorp/f-operator-rework
Split operator raft command into subcommands
2017-02-16 12:07:53 -08:00
Kyle Havlovitz 3f05576cc8
Condense raft subcommand into one doc page 2017-02-16 11:44:14 -08:00
Hadi 44aaf30455 Update downloads_tools.html.erb
add link to clojure client for consul http catalog api
2017-02-16 16:38:31 +02:00
Kyle Havlovitz 2b12a43840
Split operator raft command into subcommands 2017-02-15 13:53:34 -08:00
James Phillips 11bd2a66f1
Bumps website to Consul version 0.7.5. 2017-02-15 07:00:51 -08:00
Nathan Dataguake Basanese b38b89372f // , Add another way to update config
// , I got this from the `consul --help` output, and it seemed like a useful detail for people unfamiliar with the system.
2017-02-14 16:09:38 -08:00
Kyle Havlovitz 0262f009dd Merge pull request #2732 from hashicorp/f-validate-command
Deprecate configtest and add validate command
2017-02-10 20:34:09 -05:00
Kyle Havlovitz 35d99a81ac
Update docs and give better error for unknown client scheme 2017-02-10 19:55:54 -05:00
Kyle Havlovitz 27ee6f974d
Update website docs for validate command 2017-02-10 19:38:38 -05:00
Kyle Havlovitz 5be21e3e24 Merge pull request #2726 from hashicorp/f-cli-rework-3
Centralize command-line parsing part 3
2017-02-10 13:42:01 -05:00
James Phillips b88a7eee95 Adds clarifying note about the wakeup jitter.
Closes #2727.
2017-02-09 20:28:38 -08:00
Kyle Havlovitz 955d1b983d
Merge branch 'master' into f-cli-rework-3 2017-02-09 21:24:27 -05:00
Kyle Havlovitz e8ef771ea3 Merge pull request #2723 from hashicorp/f-cli-rework-2
Centralize command-line parsing part 2
2017-02-09 21:09:35 -05:00
Kyle Havlovitz a64c5e69a3
Cleanup and formatting adjustments 2017-02-09 20:49:17 -05:00
Kyle Havlovitz 65ad17a27d
Convert watch command to use base.Command 2017-02-09 20:36:01 -05:00
Kyle Havlovitz 1767a4dcb0
Add missing doc page for version command 2017-02-09 20:08:25 -05:00
Kyle Havlovitz 50f6c6a2bb
Convert snapshot command to use base.Command 2017-02-09 20:00:38 -05:00
Kyle Havlovitz bcdbc9175c
Convert rtt command to use base.Command 2017-02-09 19:38:06 -05:00
Kyle Havlovitz 520edc2e49
Convert reload command to use base.Command 2017-02-09 19:32:22 -05:00
Kyle Havlovitz 1a26907d01
Convert operator command to use base.Command 2017-02-09 18:19:34 -05:00
Kyle Havlovitz c78f62b83d
Convert monitor command to use base.Command 2017-02-09 17:31:52 -05:00
Kyle Havlovitz 7d72864531
Convert members command to use base.Command 2017-02-09 17:12:47 -05:00
Kyle Havlovitz 4be635d3a1
Convert maint command to use base.Command 2017-02-09 17:06:19 -05:00
Kyle Havlovitz e385af8eeb
Convert leave command to use base.Command 2017-02-09 16:48:12 -05:00
Seth Vargo 41ca1ccebc Cache assets longer 2017-02-09 14:39:51 -05:00
Seth Vargo aa8616f979 Change cache to 4h 2017-02-09 14:36:28 -05:00
Kyle Havlovitz d3b24d2d12
Convert keyring command to use base.Command 2017-02-08 18:25:47 -05:00
Kyle Havlovitz 9e156286c7
Convert join command to use base.Command 2017-02-08 17:14:02 -05:00
Kyle Havlovitz a69f2a0faf
Convert info command to use base.Command 2017-02-08 16:58:04 -05:00
Kyle Havlovitz 89771b6075
Convert exec command to use base.Command 2017-02-08 16:57:46 -05:00
Kyle Havlovitz 6cc2299123
Convert event command to use base.Command 2017-02-08 16:56:58 -05:00
Rob Genova 82d1c1a83d remove `https://consul.io` from join links; remove UI link to `downloads.html` 2017-02-08 21:05:07 +00:00
Rob Genova 394700c9de remove Atlas references from getting-started pages 2017-02-08 19:01:53 +00:00
James Phillips 511b135131 Merge pull request #2669 from legendtkl/master
Fix consul kv example with flag separator
2017-02-07 20:17:42 -08:00
James Phillips 723391b22d Removes broken WriteRequest ACL reference for catalog endpoints.
Fixes #1034.
2017-02-07 19:02:18 -08:00
Kyle Havlovitz 2a2c3bbbda Merge pull request #2717 from hashicorp/f-cli-rework
Begin centralizing command-line parsing
2017-02-07 21:15:06 -05:00
Kyle Havlovitz 9e38fc1c84
Move command Meta to base.Command and split http options 2017-02-07 19:16:41 -05:00
Jonathan Crane 112763d21d fix grammatical error in 2nd paragraph 2017-02-07 10:20:40 -05:00
James Phillips fa65db8add
Points at new release and puts tree in 0.8.0 dev mode. 2017-02-06 11:08:30 -08:00
Andrey Upadyshev f2b5a6439c Fix `acquire` parameter nesting 2017-02-03 00:20:35 +01:00
Kyle Havlovitz fbcd43e95c Merge pull request #2704 from hashicorp/f-relay-query-responses
Add relay-factor arg to keyring operations
2017-02-02 12:15:19 -05:00
James Phillips a973ed9570 Merge pull request #2572 from hashicorp/jbs-2535
Notes about memory usage (helps with #2535)
2017-02-02 09:08:58 -08:00
Kyle Havlovitz 4fc3bd3abf
Added -relay-factor param to keyring operations 2017-02-01 21:53:29 -05:00
Kyle Havlovitz f48cd78bc5 Merge pull request #2699 from hashicorp/f-tls-min-version
Add TLSMinVersion to config options
2017-02-01 16:31:53 -05:00
Kyle Havlovitz 086975ac0a
Add TLSMinVersion to config options 2017-02-01 16:20:33 -05:00
Chris Becker 2328edbcb5 Add consul kv import/export links to sidebar 2017-02-01 15:11:39 -05:00
James Phillips d593771d3c Merge pull request #2692 from Toady00/patch-1
Specify PUT for agent maintenance endpoint
2017-02-01 06:58:20 -08:00
James Phillips cbaf7ee81e Merge pull request #2666 from hashicorp/sethvargo-patch-1
Say which ec2 perms to use
2017-02-01 06:57:07 -08:00
Brandon Dennis fe8e7238e5 Specify PUT for agent maintenance endpoint
Through most of the documentation if the method isn't specified it should be a `GET` request, but here it should be a `PUT`.
2017-01-31 16:00:27 -05:00
Patrick Sodré 5b68178dc1 Simple RFC 2782 support with optional .service tag
Add support for SRV queries of names matching:
_<service>._<protocol>.[.service][.datacenter]<.domain>
2017-01-30 19:46:02 -05:00
Ryon Coleman c68106dcc6 Add Google Tag Manager #GTM-NR2SD7C 2017-01-27 15:41:42 -05:00
vishalnayak e8d43bfee2 docs: Added 'vault' to ecosystem page 2017-01-27 13:19:19 -05:00
James Phillips 2cf0c98213 Updates to Consul 0.7.3. 2017-01-26 10:16:11 -08:00
Andrey Upadyshev 0523eaf1f3 Fix missing query parameters formatting in HTTP API documentation 2017-01-25 14:34:56 +01:00
legendtkl b9ce8f6e4f Fix consul kv example with flag separator
1. fix consul kv example with flag separator
2017-01-24 17:03:12 +08:00
Kyle Havlovitz cc271aa436
Merge branch 'master' into f-prepared-query-nodemeta 2017-01-23 20:17:48 -05:00
Kyle Havlovitz 3cd054e81f
Add tests for node meta in prepared queries and update docs 2017-01-23 19:17:30 -05:00
Seth Vargo 222ade1f84 Say which ec2 perms to use 2017-01-20 17:13:28 -05:00
Cameron Stokes 5fc1913c3c Typo in docs/upgrade-specific page. 2017-01-19 12:28:30 -08:00
James Phillips 2e67edb2f2 Fixes a paste-o in the docs. 2017-01-18 16:02:04 -08:00
James Phillips 55cd1d975c
Adds catalog support for node IDs. 2017-01-18 14:26:42 -08:00
James Phillips 96bff003b7
Adds basic support for node IDs. 2017-01-17 22:47:59 -08:00
Mikhail Zholobov d54630ed79
website: Fix nesting for "raft_multiplier" option 2017-01-17 14:59:18 +02:00
Kyle Havlovitz 9080006a37
Add support for multiple metadata filters to remaining endpoints
Enabled multiple meta filters for /v1/catalog/nodes and /v1/catalog/services
2017-01-13 20:49:13 -05:00
Kyle Havlovitz e37f25dc02
Add node metadata filtering to remaining health/catalog endpoints 2017-01-13 20:08:43 -05:00
needkane 9258df0f5b occasionally->occasionally 2017-01-13 15:34:44 +08:00
Kyle Havlovitz dfe62af34a Merge pull request #2570 from vancluever/f-gce-discovery
command/agent: Google Compute Engine host discovery
2017-01-12 18:27:36 -05:00
Ben Abrams e148b1bb98
fixing typo in documentaion 2017-01-11 21:08:20 -08:00
Kyle Havlovitz 2139dbb029
Merge branch 'master' into f-gce-discovery 2017-01-11 22:57:07 -05:00
Kyle Havlovitz 84b157eade
Condense gce discovery logging a bit 2017-01-11 22:37:22 -05:00
Kyle Havlovitz 821735d175 Merge pull request #2643 from hashicorp/f-node-metadata
Node metadata
2017-01-11 20:29:24 -05:00
Kyle Havlovitz 15f008b3e3
Update client api and docs for node metadata 2017-01-11 19:28:58 -05:00
Kyle Havlovitz 561d6c71e0
Update website docs for node metadata 2017-01-11 17:52:31 -05:00
Brian Shumate f81d8c0754
DOCS: update environment variables
- Move environment variables to section of CLI page
- Remove environment variables page
- Remove environment variables nagivation menu entry
2017-01-09 12:02:06 -05:00
Brian Shumate d5bdc4c98b
DOCS: update environment variables page
- Relocate Environment Variables page to Agent section
- Correct front matter newlines issue
2017-01-06 09:42:49 -05:00
James Phillips d29cd8f4c8 Merge pull request #2573 from hashicorp/jbs-envvars
Add a page for CLI environment variables
2017-01-05 12:42:29 -08:00
James Phillips 5647e37ef2 Merge pull request #2611 from amiryal/patch-1
Correct heading level in encryption documentation
2017-01-05 12:13:13 -08:00
James Phillips 00ba30956d Merge pull request #2615 from ruslansennov/master
update `/v1/agent/service/register` endpoint doc
2017-01-05 12:08:50 -08:00
James Phillips 0d4baea1d2 Merge pull request #2627 from legendtkl/master
fix typo Check-And_set to Check-And-Set
2017-01-05 11:55:02 -08:00
James Phillips 8d83ac4771 Merge pull request #2628 from jippi/patch-1
Adding hashi-ui to community tools
2017-01-05 11:51:21 -08:00
James Phillips 9da1d8704c Merge pull request #2629 from Ashald/f-website/add-consul-announcer
Add consul-announcer to Community Tools
2017-01-05 11:50:48 -08:00
James Nugent 3b1f523b85 cli: Add KV `export` and `import`
This commit adds two new commands to the Consul KV CLI, which export and
import a JSON formatted representation of the Consul KV tree. It is
useful to migrate parts of the KV tree between unrelated Consul
clusters, and could also be used for initial data population of the KV
store.
2017-01-05 07:57:38 -06:00
James Nugent c32fe92eee cli: Add -base64 option to `consul kv put`
This commit adds a -base64 option to the consul kv put command, which
base 64 decodeds the data prior to writing it. This can be used in
conjunction with `consul kv get -base64 key`.
2017-01-04 16:12:21 -06:00
James Nugent a24e5041ac Merge pull request #2631 from hashicorp/kv-get-base64
cli: Add -base64 option to `consul kv get`
2017-01-04 16:00:27 -06:00
James Nugent 2bb6121e54 cli: Add -base64 option to `consul kv get`
This commit adds a `-base64` option to the `consul kv get` command,
which base 64 encodes the output such that it can be processed by
terminal tools in the event that the data is binary. The flag defaults
to false.
2017-01-04 15:41:40 -06:00
Borys Pierov 5a620246f4 Add consul-announcer to Community Tools 2017-01-04 11:03:19 -05:00
Christian Winther 452ab68f9d Update downloads_tools.html.erb 2017-01-03 21:14:39 +01:00
legendtkl b3e0702ab8 fix typo Check-And_set to Check-And-Set 2017-01-04 00:46:16 +08:00
Ruslan Sennov e81502babb update `/v1/agent/service/register` endpoint doc 2016-12-26 23:32:20 +03:00
Amir Yalon 58ee61c3c7 Correct heading level in encryption documentation
The ‘RPC Encryption’ heading is semantically at the same level as ‘Gossip Encryption’.
2016-12-22 10:51:20 +02:00
James Phillips 6f03545082
Updates downloads page link to 0.7.2. 2016-12-21 05:20:54 -08:00
Bradley Falzon 5acd28c506 Fix typo in command/kv/put doc 2016-12-21 14:02:26 +10:30
James Phillips 8a64bb6445 Adds session policy example to ACL internals doc. 2016-12-14 21:31:59 -08:00
James Phillips fe07574220
Fixes a typo in the agent options docs. 2016-12-14 21:03:16 -08:00
James Phillips b617e54ff0 Merge pull request #2594 from hashicorp/acl-complete
Adds complete ACL support for /v1/agent endpoints.
2016-12-14 20:49:00 -08:00
James Phillips 90cd498ea6
Adds some basic documentation about the new ACL changes. 2016-12-14 20:32:44 -08:00
Kyle Havlovitz 398f4a04ef
Add a notice about deprecation of atlas features 2016-12-14 15:13:51 -05:00
James Phillips 927aa3789a
Adds ACL management support to the agent. 2016-12-14 07:07:41 -08:00
James Phillips 67f1fe8d0b
Adds support for a new "acl_agent_token" which is used for internal
catalog operations.
2016-12-12 14:52:27 -08:00
James Phillips 4bb56b83ea Merge pull request #2590 from hashicorp/acl-complete-catalog
Adds new node ACL policy and applies it to catalog endpoints.
2016-12-12 14:52:10 -08:00
James Phillips b7daa87ec7 Merge pull request #2575 from bradleyfalzon/patch-1
Link to consensus.html#deployment-table not #toc_4
2016-12-08 14:02:52 -08:00
Seth Vargo 52637b1125
Switch to KV CLI in getting started 2016-12-07 14:01:51 -08:00
Seth Vargo 6f24588b8f
Update homepage to use KV CLI instead of curl 2016-12-07 11:32:35 -08:00
Chris Marchesi 1b4e26d005 command/agent: Google Compute Engine host discovery
This commit adds several command-line and config options that facilitate
host discovery through Google Compute Engine (GCE), much like the
recently added EC2 host discovery options. This should assist with
bootstrapping and joining servers within GCE when non-static addresses
are used, such as when using managed instance groups.

Documentation has also been added. It should be noted that if running
from within a GCE instance, the only option that should be necessary is
-retry-join-gce-tag-value.
2016-12-06 17:46:40 -08:00
Brian Shumate 5a26a906cd
Overlooked saving a couple changes 2016-12-06 18:01:43 -05:00
Brian Shumate c5b68467c6
updates based on feedback 2016-12-06 14:46:26 -05:00
Brian Shumate c509815493
Address feedback 2016-12-06 14:12:05 -05:00
James Phillips eb07e77c1c
Adds an opt-in for new ACL policies and features coming in Consul 0.8. 2016-12-06 11:06:14 -08:00
Bradley Falzon de851480c5 Link to consensus.html#deployment-table not #toc_4 2016-12-06 15:40:40 +10:30
James Phillips c5ca72c5a5
Fixes broken link in options doc. 2016-12-05 18:53:51 -08:00
James Phillips 7c0f6bd742 Clarifies ACL replication token. 2016-12-05 18:43:05 -08:00
Brian Shumate bcec3b3eb4
Some examples where sockets are possible as well 2016-12-05 16:56:31 -05:00
Brian Shumate cd2b3ed193
Add a table of CLI environment variables 2016-12-05 12:35:44 -05:00
Brian Shumate e507dc108b
Notes about memory usage (helps with #2535) 2016-12-05 12:28:49 -05:00
shantanugadgil 09f30bc375 Update kv.html.markdown 2016-12-03 13:35:55 +05:30
Mike Zupan 492d39fbb3 Needs to be moved
This took 2 hours from my life. The near has to be inside a service and not in the main block.
2016-12-01 22:47:02 -08:00
William Lord 67a84e0e20 Update snapshot.html.markdown 2016-12-01 10:11:35 +00:00
James Phillips bd5adea5ba Merge pull request #2555 from hashicorp/pr-2497-slackpad
Updates Circonus library and adds support for custom display name and tags.
2016-11-30 21:42:01 -08:00
James Phillips 7d67346f42
Changes Consul version number for new Circonus options. 2016-11-30 21:35:54 -08:00
Kyle Havlovitz dd05afb32e Add reload/leave http endpoints (#2516) 2016-11-30 13:29:42 -05:00
Brian Shumate b59ca6bd4d
Update compatibility table for #2540 2016-11-30 11:17:52 -05:00
James Phillips ee16675eda Merge pull request #2532 from jamtur01/docspass
Documentation pass
2016-11-29 15:15:04 -08:00
James Phillips f4f96c180d Update dns.html.markdown 2016-11-29 15:01:38 -08:00
anatoly 62921541ec [website]: Clojure client to SDK
in the "Download Consul Tools" list
2016-11-29 02:12:14 -05:00
Kyle Havlovitz d91854f3b0 Add monitor http endpoint 2016-11-28 18:36:26 -05:00
James Turnbull b7566cd0e8 Fix to watch command docs 2016-11-25 13:34:08 -05:00
James Turnbull edd5739e90 Final dc pass 2016-11-25 13:29:55 -05:00
James Turnbull 25566a292b Removed two space after period exceptions 2016-11-25 13:25:09 -05:00
James Turnbull 39364aa937 Another catch 2016-11-25 13:14:09 -05:00
James Turnbull 38be465b7d And a handful more 2016-11-25 12:39:08 -05:00
James Turnbull 51bc365377 More consistency 2016-11-25 12:34:07 -05:00
James Turnbull dd4918fd16 Documentation pass
I was reviewing some docs and found a few issues.

1. Fixed some spelling mistakes.
2. Re-formatted some paragraphs.
3. Changed some potentially loaded language.
4. Fixed some grammar issues.
5. Tried to consistently use syntax-highlighting.
6. Fixed post-period spacing.
7. Fixed some formatting issues and inconsistency.
8. All "notes" are either proper notes or re-written.
2016-11-25 12:02:32 -05:00
Kyle Havlovitz 66dea6951a Fix keyring doc method wording 2016-11-22 20:10:43 -05:00
Kyle Havlovitz 79f339b5dc Combine keyring endpoints into one 2016-11-22 20:10:43 -05:00
Kyle Havlovitz b13c9dc5d3 Add version specific note to keyring http docs 2016-11-22 20:10:43 -05:00
Kyle Havlovitz 86ae45c78b Add keyring api website doc sections 2016-11-22 20:10:43 -05:00
James Phillips 2319624f69 Makes addresses blank in service definition. 2016-11-22 08:29:29 -08:00
James Phillips a34d968aeb Tweaks title of snapshot link. 2016-11-21 09:02:19 -08:00
James Phillips 6814a3754e Merge pull request #2515 from hashicorp/f-snapshot-agent-docs
Adds a draft of the snapshot agent docs.
2016-11-20 22:42:22 -08:00
James Phillips ef4168cd53
Adds details about config files. 2016-11-20 22:41:33 -08:00
James Phillips 01541fefd1
Tweaks local option name. 2016-11-19 18:23:37 -08:00
Brian Shumate 71e00601ec
tweaks 2016-11-18 10:53:59 -05:00
Brian Shumate e7b21b6876
Attempt to describe entire response (for #2393)
Describe fields returned by /v1/catalog/service/<service>
2016-11-18 10:33:37 -05:00
James Phillips 4ee62afff3 Merge pull request #2504 from tolitius/envoy
[website]: adding a Clojure client
2016-11-17 16:56:38 -08:00
James Phillips c2561804fc Merge pull request #2501 from Drawaes/master
[Website] Update community tools page to add condenserdotnet
2016-11-17 16:55:39 -08:00
James Phillips 59da99db62 Tweaks markup on community page. 2016-11-17 16:55:27 -08:00
James Phillips 916d0aa133 Merge pull request #2397 from sdinakar85/patch-1
Multiple Datacenter Documentation
2016-11-17 16:43:55 -08:00
James Phillips cafd59a45a Tweaks formatting of example JSON. 2016-11-17 16:43:47 -08:00
James Phillips 645c9f85d2
Adds a draft of the snapshot agent docs. 2016-11-16 21:38:02 -08:00
Cameron Stokes 17bc5a80ba ~ docs: Typo in agent options page. 2016-11-16 07:58:24 -08:00
Benjamin Farley e52e0b2a5a Small change to how operator docs read 2016-11-16 09:01:51 +00:00
Brian Shumate a487aec803 Docs: Web UI config updates (#2411)
* Updates around Web UI directory configuration

* consistent terms
2016-11-12 13:08:15 -08:00
anatoly d6aed1d3b2 [website]: adding a Clojure client
to the "Download Consul Tools" list
2016-11-10 22:02:00 -05:00
Tim Seaward 2c28bd47a3 Update downloads_tools.html.erb
Added condenserdotnet
2016-11-10 22:29:44 +00:00
James Phillips 267e2f9f4c Update upgrade-specific.html.markdown 2016-11-10 13:38:36 -08:00
James Phillips 3e5916181e Update dns-cache.html.markdown 2016-11-10 13:37:44 -08:00