You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by me...@apache.org on 2016/02/28 07:47:02 UTC
mesos git commit: Improved the documentation for setting ACLs.
Repository: mesos
Updated Branches:
refs/heads/master 154e82e1c -> f79c6bca0
Improved the documentation for setting ACLs.
Review: https://reviews.apache.org/r/44144/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/f79c6bca
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/f79c6bca
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/f79c6bca
Branch: refs/heads/master
Commit: f79c6bca0aab89c61d40de3005ba91e505fad05d
Parents: 154e82e
Author: Joerg Schad <jo...@mesosphere.io>
Authored: Sat Feb 27 22:46:40 2016 -0800
Committer: Adam B <ad...@mesosphere.io>
Committed: Sat Feb 27 22:46:40 2016 -0800
----------------------------------------------------------------------
docs/authorization.md | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/f79c6bca/docs/authorization.md
----------------------------------------------------------------------
diff --git a/docs/authorization.md b/docs/authorization.md
index c948f12..a865b6b 100644
--- a/docs/authorization.md
+++ b/docs/authorization.md
@@ -17,7 +17,7 @@ Authorization currently allows
## ACLs
-Authorization is implemented via Access Control Lists (ACLs). For each of the above cases, ACLs can be used to restrict access. Operators can setup ACLs in JSON format. See [authorizer.proto](https://github.com/apache/mesos/blob/master/include/mesos/authorizer/authorizer.proto) for details.
+Authorization is implemented via Access Control Lists (ACLs). For each of the above cases, ACLs can be used to restrict access. Operators can setup ACLs in JSON format when starting the master (see [Configuring Authorization](#aclsConfiguration) for details).
Each ACL specifies a set of `Subjects` that can perform an `Action` on a set of `Objects`.
@@ -403,8 +403,8 @@ In a real-world organization, principals and roles might be used to represent va
]
}
-
-## Configuring authorization
+<a name="aclsConfiguration"></a>
+## Configuring Authorization
Authorization is configured by specifying the `--acls` flag when starting the master:
@@ -412,7 +412,7 @@ Authorization is configured by specifying the `--acls` flag when starting the ma
or a file path containing the JSON-formatted ACLs used
for authorization. Path could be of the form 'file:///path/to/file'
or '/path/to/file'.
- See the ACLs protobuf in authorizer.proto for the expected format.
+ See the ACLs protobuf in [authorizer.proto](https://github.com/apache/mesos/blob/master/include/mesos/authorizer/authorizer.proto) for the expected format.
For more information on master command-line flags, see the
[configuration](configuration.md) page.