From 8820c1ca2b0d6643ad79f1d4dc71614583d3dcfe Mon Sep 17 00:00:00 2001 From: Steven Armstrong Date: Thu, 5 Mar 2015 16:39:14 +0100 Subject: [PATCH] add support for acl options Signed-off-by: Steven Armstrong --- cdist/conf/type/__consul_agent/man.text | 18 ++++++++++++++++++ .../type/__consul_agent/parameter/optional | 6 ++++++ 2 files changed, 24 insertions(+) diff --git a/cdist/conf/type/__consul_agent/man.text b/cdist/conf/type/__consul_agent/man.text index 63337185..3491eb4c 100644 --- a/cdist/conf/type/__consul_agent/man.text +++ b/cdist/conf/type/__consul_agent/man.text @@ -20,6 +20,23 @@ None. OPTIONAL PARAMETERS ------------------- +acl-datacenter:: + only used by servers. This designates the datacenter which is authoritative + for ACL information. +acl-default-policy:: + either "allow" or "deny"; defaults to "allow". The default policy controls the + behavior of a token when there is no matching rule. +acl-down-policy:: + either "allow", "deny" or "extend-cache"; "extend-cache" is the default. +acl-master-token:: + only used for servers in the 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. +acl-token:: + when provided, the agent will use this token when making requests to the + Consul servers. +acl-ttl:: + used to control Time-To-Live caching of ACLs. bind-addr:: sets the bind address for cluster communication bootstrap-expect:: @@ -126,6 +143,7 @@ __consul_agent \ SEE ALSO -------- - cdist-type(7) +- http://www.consul.io/docs/agent/options.html COPYING diff --git a/cdist/conf/type/__consul_agent/parameter/optional b/cdist/conf/type/__consul_agent/parameter/optional index bceaf060..8940023d 100644 --- a/cdist/conf/type/__consul_agent/parameter/optional +++ b/cdist/conf/type/__consul_agent/parameter/optional @@ -1,3 +1,9 @@ +acl-datacenter +acl-default-policy +acl-down-policy +acl-master-token +acl-token +acl-ttl bind-addr bootstrap-expect ca-file-source