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

Merge pull request #749 from ryanbreen/GH-747 

Website: GH-747 Add docs on acl_master_token installation.
This commit is contained in:
Ryan Breen 2015-03-03 11:55:31 -05:00
parent 77ce44d5d2 ad7d1b3090
commit 9293118ee3
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -267,6 +267,11 @@ definitions support being updated during a reload.
for servers in the [`acl_datacenter`](#acl_datacenter). This token will be created with management-level
permissions if it does not exist. It allows operators to bootstrap the ACL system
with a token ID that is well-known.
<br><br>
Note that the `acl_master_token` is only installed when a server acquires cluster leadership. If
you would like to install or change the `acl_master_token`, set the new value for `acl_master_token`
in the configuration for all servers. Once this is done, restart the current leader to force a
leader election.
* <a name="acl_token"></a><a href="#acl_token">`acl_token`</a> - When provided, the agent will use this
token when making requests to the Consul servers. Clients can override this token on a per-request

10
website/source/docs/internals/acl.html.markdown
View File

@ -86,9 +86,13 @@ key "_rexec/" {
### Bootstrapping ACLs
Bootstrapping the ACL system is done by providing an initial `acl_master_token`
[configuration](/docs/agent/options.html), which will be created as a
"management" type token if it does not exist.
Bootstrapping the ACL system is done by providing an initial [`acl_master_token`
configuration](/docs/agent/options.html#acl_master_token), which will be created
as a "management" type token if it does not exist. Note that the `acl_master_token`
is only installed when a server acquires cluster leadership. If you would
like to install or change the `acl_master_token`, set the new value for
`acl_master_token` in the configuration for all servers. Once this is done, restart the
current leader to force a leader election.
## Rule Specification