Skip to content

Commit edaf606

Browse files
github-actions[bot]Chef-PradyumnIanMadd
authored
Update licensing information at _index.md (#153) (#155)
* Update licensing information at _index.md Licensing information for Infra Client 19 was out-of-date. Have made the changes. * Editing license text --------- (cherry picked from commit fa875e8) Signed-off-by: Ian Maddaus <ian.maddaus@progress.com> Co-authored-by: Chef-Pradyumn <prabhu@progress.com> Co-authored-by: Ian Maddaus <ian.maddaus@progress.com>
1 parent acc9056 commit edaf606

1 file changed

Lines changed: 26 additions & 26 deletions

File tree

content/license/_index.md

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -9,45 +9,43 @@ parent = "licensing"
99
weight = 11
1010
+++
1111

12-
This document outlines the licensing requirements and enforcement policies for Chef Infra Client 19.
12+
This document outlines the licensing requirements and enforcement policies for Chef Infra Client.
1313

1414
Depending on the distribution you download and install, you may have to add a license key to run Chef Infra Client.
15-
You must also [accept the Chef End User License Agreement (Chef EULA)](#accept-the-end-user-license-agreement) when you first run Chef Infra Client 19.
15+
You must also [accept the Chef End User License Agreement (Chef EULA)](#accept-the-end-user-license-agreement) when you first run Chef Infra Client.
1616

1717
## Licensing requirements
1818

19-
Chef Infra Client 19 has different licensing requirements depending on the distribution you download.
19+
Chef Infra Client has different licensing requirements depending on the distribution you download.
2020

21-
### No license enforcement
22-
23-
Chef Infra Client doesn't require a license to run if you download an official distribution.
21+
### License required
2422

25-
This includes:
23+
License key requirements are enforced:
2624

27-
- Downloading Infra Client from the customer portal.
28-
- Installing the Infra Client Habitat package.
29-
- Installing Infra Client using the migration tool or native installer.
25+
- At the point of download for the binaries from Progress Chef Download Portal or through Habitat package distribution.
26+
- At first run when using runtime installations and workflows, if the binaries are from the Chef API.
27+
- For Chef software from any other sources not listed above, such as public Ruby gems or channels outside of the official Habitat distribution and download portal.
3028

31-
### License required
29+
### No license key requirement
3230

33-
You need a license key to run Chef Infra Client when you:
31+
Chef Infra Client doesn't require a license key to:
3432

35-
- Download it from unofficial sources (public Ruby gem).
36-
- Use runtime installations and workflows.
33+
- Use runtime installations and workflows when using your own source to download binaries.
34+
- Execute any non-download commands using software obtained from an official source.
3735

3836
## Add a license
3937

4038
Chef Infra Client has three ways to set a license:
4139

42-
- with an environment variable
43-
- with a command line option
44-
- with the command line interactive dialog
40+
- An environment variable
41+
- A command line option
42+
- The command line interactive dialog
4543

4644
After setting a license key, Chef Infra Client validates it with Progress Chef's licensing service.
4745

4846
### Environment variable
4947

50-
- You can set the license key adding the `CHEF_LICENSE_KEY` environment variable:
48+
- You can set the license key by setting the `CHEF_LICENSE_KEY` environment variable:
5149

5250
```sh
5351
export CHEF_LICENSE_KEY=<LICENSE_KEY>
@@ -75,13 +73,14 @@ To set a license key with the CLI interactive dialog, follow these steps:
7573

7674
It should return version 19.0.54 or greater for Infra Client RC 1.
7775

78-
1. Run `chef-client` in local mode and why-run mode:
76+
1. Run `chef-client` in local mode and `why-run` mode:
7977

8078
```sh
8179
chef-client --local-mode --why-run
8280
```
8381

84-
Local mode runs Chef Infra Client on your local machine as if it were running against Chef Infra Server. why-run mode shows you what Chef Infra Client would configure if a Chef Infra Client run occurs.
82+
Local mode runs Chef Infra Client on your local machine as if it were running against Chef Infra Server.
83+
`why-run` mode shows you what Chef Infra Client would configure during a Chef Infra Client run.
8584

8685
1. At the first prompt, select **I already have a license ID**.
8786

@@ -103,7 +102,7 @@ To set a license key with the CLI interactive dialog, follow these steps:
103102
104103
## Accept the End User License Agreement
105104
106-
When you first run Chef Infra Client 19, you must accept the End User License Agreement (EULA).
105+
When you first run Chef Infra Client, you must accept the End User License Agreement (EULA).
107106
108107
Chef Infra Client accepts a license using a command line option, environment variable, or config file.
109108
@@ -118,19 +117,19 @@ Chef Infra Client accepts the following license acceptance options:
118117
: Similar to `accept`, but no messaging is sent to STDOUT.
119118
120119
`accept-no-persist`
121-
: Similar to `accept-silent`, but no marker file is persisted. Future invocation will require accepting the license again.
120+
: Similar to `accept-silent`, but no marker file is persisted. Future invocations will require accepting the license again.
122121
123122
### Command line option
124123
125-
Accept the Chef License with a command line invocation.
124+
To accept the Chef License, run `chef-client` with the `--chef-license` option:
126125
127126
```sh
128127
chef-client --chef-license <LICENSE_OPTION>
129128
```
130129
131130
### Environment variable
132131
133-
Accept the Chef License by setting an environment variable. For example:
132+
To accept the Chef License, set the `CHEF_LICENSE` environment variable:
134133
135134
```sh
136135
export CHEF_LICENSE="<LICENSE_OPTION>"
@@ -139,9 +138,10 @@ chef-client OPTION VALUE
139138
140139
### Config file
141140
142-
You can accept the Chef License with the Chef Infra Client or Knife config files.
141+
You can accept the Chef License in the Chef Infra Client or Knife config files.
143142
144-
On a workstation, you can set this in the [`~/.chef/config.rb` or `~/.chef/knife.rb` files](https://docs.chef.io/workstation/config_rb/), and on a node you can set this in the [`/etc/chef/client.rb`]({{< relref "/install/config_rb_client" >}}) file.
143+
On a workstation, set this in the [`~/.chef/config.rb` or `~/.chef/knife.rb` files](https://docs.chef.io/workstation/config_rb/).
144+
On a node, set this in the [`/etc/chef/client.rb`]({{< relref "/install/config_rb_client" >}}) file.
145145
146146
```ruby
147147
chef_license "<LICENSE_OPTION>"

0 commit comments

Comments
 (0)