Skip to content

Commit ab3ef77

Browse files
sanjain-progressSachinIanMadd
authored
Update Documentation for Artifactory Authentication Options (#4330)
* Update Documentation for Artifactory Authentication Options Signed-off-by: Sachin <[email protected]> * Edits Signed-off-by: Ian Maddaus <[email protected]> --------- Signed-off-by: Sachin <[email protected]> Signed-off-by: Ian Maddaus <[email protected]> Co-authored-by: Sachin <[email protected]> Co-authored-by: Ian Maddaus <[email protected]> Co-authored-by: Ian Maddaus <[email protected]>
1 parent c94de2d commit ab3ef77

File tree

2 files changed

+11
-4
lines changed

2 files changed

+11
-4
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: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,19 @@ A `Policyfile.rb` file may contain the following settings:
2626
- `:supermarket`
2727

2828
`:artifactory`
29-
: Pulls cookbooks from an Artifactory server. Requires either `artifactory_api_key` to be set in `config.rb` or
30-
`ARTIFACTORY_API_KEY` to be set in your environment.
29+
: Pulls cookbooks from an Artifactory server.
3130

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

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+
3442
`:chef_repo`
3543
: Pulls cookbooks from a monolithic cookbook repository. This may be a path to the top-level
3644
of a cookbook repository or to the `/cookbooks` directory within that repository.

0 commit comments

Comments
 (0)