Skip to content

Commit

Permalink
Edits
Browse files Browse the repository at this point in the history
Signed-off-by: Ian Maddaus <ian.maddaus@progress.com>
  • Loading branch information
IanMadd committed Nov 18, 2024
1 parent 6339786 commit 43d0795
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 7 deletions.
3 changes: 1 addition & 2 deletions content/config_rb_policyfile.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 >}}

Expand Down
14 changes: 9 additions & 5 deletions content/reusable/md/policyfile_rb_settings.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,18 @@ A `Policyfile.rb` file may contain the following settings:

`:artifactory`
: Pulls cookbooks from an Artifactory server.
There are two ways to authenticate:
- **API Key**: Set `artifactory_api_key` in config.rb or use the environment variable `ARTIFACTORY_API_KEY`.
- **Identity Token** : Set `artifactory_identity_token` in config.rb or use the environment variable `ARTIFACTORY_IDENTITY_TOKEN`.

**Note**: If both `ARTIFACTORY_API_KEY` and `ARTIFACTORY_IDENTITY_TOKEN` are set, `ARTIFACTORY_IDENTITY_TOKEN` will take precedence.

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.
Expand Down

0 comments on commit 43d0795

Please sign in to comment.