Skip to content

Commit 43d0795

Browse files
committed
Edits
Signed-off-by: Ian Maddaus <[email protected]>
1 parent 6339786 commit 43d0795

File tree

2 files changed

+10
-7
lines changed

2 files changed

+10
-7
lines changed

content/config_rb_policyfile.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@ product = ["client", "server"]
1919

2020
{{< note >}}
2121

22-
For more information about Policyfile, see [About
23-
Policyfile](/policyfile/)
22+
For more information, see the [Policyfile documentation](/policyfile/).
2423

2524
{{< /note >}}
2625

content/reusable/md/policyfile_rb_settings.md

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,18 @@ A `Policyfile.rb` file may contain the following settings:
2727

2828
`:artifactory`
2929
: Pulls cookbooks from an Artifactory server.
30-
There are two ways to authenticate:
31-
- **API Key**: Set `artifactory_api_key` in config.rb or use the environment variable `ARTIFACTORY_API_KEY`.
32-
- **Identity Token** : Set `artifactory_identity_token` in config.rb or use the environment variable `ARTIFACTORY_IDENTITY_TOKEN`.
33-
34-
**Note**: If both `ARTIFACTORY_API_KEY` and `ARTIFACTORY_IDENTITY_TOKEN` are set, `ARTIFACTORY_IDENTITY_TOKEN` will take precedence.
3530

3631
For example, `default_source :artifactory, "https://artifactory.example/api/chef/my-supermarket"`.
3732

33+
There are two ways to authenticate with the Artifactory server:
34+
35+
- **API key**: Set `artifactory_api_key` in config.rb or use the `ARTIFACTORY_API_KEY` environment variable.
36+
- **Identity token**: Set `artifactory_identity_token` in config.rb or use the `ARTIFACTORY_IDENTITY_TOKEN` environment variable.
37+
38+
The Artifactory identity token is new in Chef Workstation v24.11.
39+
40+
**Note**: If both `ARTIFACTORY_API_KEY` and `ARTIFACTORY_IDENTITY_TOKEN` are set, `ARTIFACTORY_IDENTITY_TOKEN` takes precedence.
41+
3842
`:chef_repo`
3943
: Pulls cookbooks from a monolithic cookbook repository. This may be a path to the top-level
4044
of a cookbook repository or to the `/cookbooks` directory within that repository.

0 commit comments

Comments
 (0)