Skip to content

Commit

Permalink
backport of commit 88ee1d0 (#17602)
Browse files Browse the repository at this point in the history
Co-authored-by: Bryce Kalow <[email protected]>
Co-authored-by: Luis (LT) Carbonell <[email protected]>
  • Loading branch information
3 people authored Aug 16, 2023
1 parent ae16124 commit 3f2ffb3
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion website/content/docs/agent/index.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,7 @@ template {
[caching]: /docs/agent/caching
[persistent-cache]: /docs/agent/caching/persistent-caches
[template]: /docs/agent/template
[template-config]: /docs/agent/template-config
[template-config]: /docs/agent/template#template-configurations
[agent-api]: /docs/agent/#agent_api-stanza
[listener]: /docs/agent#listener-stanza
[listener_main]: /docs/configuration/listener/tcp
Expand Down
4 changes: 2 additions & 2 deletions website/content/docs/auth/login-mfa/faq.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,11 @@ The Step-up Enterprise MFA will co-exist with the newly introduced Login MFA sta
| [Okta Auth MFA](/docs/auth/okta#mfa) | This is MFA as part of [Okta Auth method](/docs/auth/okta) in Vault OSS, where MFA is enforced by Okta on login. MFA must be satisfied for authentication to be successful. This is different from the Okta MFA method used with Login MFA and Step-up Enterprise MFA. CLI/API login are supported. | MFA is managed externally by Okta | Supported in Vault OSS |
| [Step-up Enterprise MFA](/docs/enterprise/mfa) | MFA in Vault Enterprise provides MFA for login and for step-up access to sensitive resources in Vault. Supports CLI/API based login, and ACL/Sentinel policies. | MFA is managed by Vault | Supported in Vault Enterprise |

~> **Note**: [The Legacy MFA](/docs/auth/mfa) is a **deprecated** MFA workflow in Vault OSS. Refer [here](#q-what-is-the-legacy-mfa-feature) for more details.
~> **Note**: [The Legacy MFA](/docs/v1.10.x/auth/mfa) is a **deprecated** MFA workflow in Vault OSS. Refer [here](#q-what-is-the-legacy-mfa-feature) for more details.

### Q: what is the legacy MFA feature?

[Legacy MFA](/docs/auth/mfa) is functionality that was available in Vault OSS, prior to introducing MFA in the Enterprise version. This is now a deprecated feature. Please see the [Vault Feature Deprecation Notice and Plans](/docs/deprecation) for detailed product plans around deprecated features. We plan to remove Legacy MFA in 1.11.
[Legacy MFA](/docs/v1.10.x/auth/mfa) is functionality that was available in Vault OSS, prior to introducing MFA in the Enterprise version. This is now a deprecated feature. Please see the [Vault Feature Deprecation Notice and Plans](/docs/deprecation) for detailed product plans around deprecated features. We plan to remove Legacy MFA in 1.11.

### Q: will HCP Vault support MFA?

Expand Down
4 changes: 2 additions & 2 deletions website/content/docs/enterprise/managed-keys.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ To satisfy these requirements, Vault has a centralized abstraction called
delegate these operations to a trusted external KMS.

Minimally, a managed key consists of a named managed key entry managed by the
[`sys/managed-key`](../../api-docs/system/managed-keys) API. Besides a name,
[`sys/managed-key`](/api-docs/system/managed-keys) API. Besides a name,
there are backend specific configurations to access the key in question.

For PKCS#11 (HSM) backed managed keys, the managed key configuration must
reference a [kms library stanza](../configuration/kms-library) which points
reference a [kms library stanza](/docs/configuration/kms-library) which points
to a PKCS#11 access library on the host machine.

Note that a configured, named managed key corresponds to a single key within
Expand Down
4 changes: 2 additions & 2 deletions website/content/docs/platform/k8s/injector/annotations.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -95,11 +95,11 @@ them, optional commands to run, etc.
- `vault.hashicorp.com/template-config-exit-on-retry-failure` - controls whether
Vault Agent exits after it has exhausted its number of template retry attempts
due to failures. Defaults to `true`. See [Vault Agent Template
Config](/docs/agent/template-config) for more details.
Config](/docs/agent/template#template-configurations) for more details.

- `vault.hashicorp.com/template-static-secret-render-interval` - If specified,
configures how often Vault Agent Template should render non-leased secrets such as KV v2.
See [Vault Agent Template Config](/docs/agent/template-config) for more details.
See [Vault Agent Template Config](/docs/agent/template#template-configurations) for more details.

- `vault.hashicorp.com/agent-extra-secret` - mounts Kubernetes secret as a volume at
`/vault/custom` in the sidecar/init containers. Useful for custom Agent configs with
Expand Down
2 changes: 1 addition & 1 deletion website/content/docs/release-notes/1.12.0.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ The billing period for client counting API can now be specified with the [curren

### Redis database secrets engine

With the support of the Redis database secrets engine, users can use Vault to manage static and dynamic credentials for Redis OSS. The engine works similarly to other database secrets engines. Refer to the [Redis](/docs/secrets/redis) documentation for more information. Huge thanks to [Francis Hitchens](https://github.com/fhitchen), who contributed their repository to HashiCorp
With the support of the Redis database secrets engine, users can use Vault to manage static and dynamic credentials for Redis OSS. The engine works similarly to other database secrets engines. Refer to the [Redis](/docs/secrets/databases/redis) documentation for more information. Huge thanks to [Francis Hitchens](https://github.com/fhitchen), who contributed their repository to HashiCorp

### AWS elasticache database secrets engine
With the support of the AWS ElastiCache database secrets engine, users may use Vault to manage static credentials for AWS Elasticache instances. The engine will work similarly to other database secrets engines. Refer to the [elasticache](/docs/secrets/databases/rediselasticache) documentation for more information.
Expand Down

0 comments on commit 3f2ffb3

Please sign in to comment.