Skip to content

Commit

Permalink
Cherry pick #12391 TTL docs (#12981)
Browse files Browse the repository at this point in the history
  • Loading branch information
tomhjp authored Nov 8, 2021
1 parent ba55bcd commit 110bba1
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 5 deletions.
5 changes: 3 additions & 2 deletions website/content/docs/commands/auth/tune.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -63,5 +63,6 @@ flags](/docs/commands) included on all commands.

- `-max-lease-ttl` `(duration: "")` - The maximum lease TTL for this auth
method. If unspecified, this defaults to the Vault server's globally
configured maximum lease TTL, or a previously configured value for the auth
method.
configured [maximum lease TTL](/docs/configuration#max_lease_ttl), or a
previously configured value for the auth method. This value is allowed to
override the server's global max TTL; it can be longer or shorter.
5 changes: 3 additions & 2 deletions website/content/docs/commands/secrets/tune.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -69,5 +69,6 @@ flags](/docs/commands) included on all commands.

- `-max-lease-ttl` `(duration: "")` - The maximum lease TTL for this secrets
engine. If unspecified, this defaults to the Vault server's globally
configured maximum lease TTL, or a previously configured value for the secrets
engine.
configured [maximum lease TTL](/docs/configuration#max_lease_ttl), or a
previously configured value for the secrets engine. This value is allowed to
override the server's global max TTL; it can be longer or shorter.
5 changes: 4 additions & 1 deletion website/content/docs/configuration/index.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,10 @@ to specify where the configuration is.

- `max_lease_ttl` `(string: "768h")` – Specifies the maximum possible lease
duration for tokens and secrets. This is specified using a label
suffix like `"30s"` or `"1h"`.
suffix like `"30s"` or `"1h"`. Individual mounts can override this value
by tuning the mount with the `max-lease-ttl` flag of the
[auth](/docs/commands/auth/tune#max-lease-ttl) or
[secret](/docs/commands/secrets/tune#max-lease-ttl) commands.

- `default_max_request_duration` `(string: "90s")` – Specifies the default
maximum request duration allowed before Vault cancels the request. This can
Expand Down

0 comments on commit 110bba1

Please sign in to comment.