diff --git a/content/config_rb_policyfile.md b/content/config_rb_policyfile.md index 003eb63f2a..72269b7c25 100644 --- a/content/config_rb_policyfile.md +++ b/content/config_rb_policyfile.md @@ -19,8 +19,7 @@ product = ["client", "server"] {{< note >}} -For more information about Policyfile, see [About -Policyfile](/policyfile/) +For more information, see the [Policyfile documentation](/policyfile/). {{< /note >}} diff --git a/content/reusable/md/policyfile_rb_settings.md b/content/reusable/md/policyfile_rb_settings.md index f1c4ed7a1e..592985f22f 100644 --- a/content/reusable/md/policyfile_rb_settings.md +++ b/content/reusable/md/policyfile_rb_settings.md @@ -26,11 +26,19 @@ A `Policyfile.rb` file may contain the following settings: - `:supermarket` `:artifactory` - : Pulls cookbooks from an Artifactory server. Requires either `artifactory_api_key` to be set in `config.rb` or - `ARTIFACTORY_API_KEY` to be set in your environment. + : Pulls cookbooks from an Artifactory server. For example, `default_source :artifactory, "https://artifactory.example/api/chef/my-supermarket"`. + There are two ways to authenticate with the Artifactory server: + + - **API key**: Set `artifactory_api_key` in config.rb or use the `ARTIFACTORY_API_KEY` environment variable. + - **Identity token**: Set `artifactory_identity_token` in config.rb or use the `ARTIFACTORY_IDENTITY_TOKEN` environment variable. + + The Artifactory identity token is new in Chef Workstation v24.11. + + **Note**: If both `ARTIFACTORY_API_KEY` and `ARTIFACTORY_IDENTITY_TOKEN` are set, `ARTIFACTORY_IDENTITY_TOKEN` takes precedence. + `:chef_repo` : Pulls cookbooks from a monolithic cookbook repository. This may be a path to the top-level of a cookbook repository or to the `/cookbooks` directory within that repository.