From 8d54828349684866222e7fc0495b6bddfb9f14ee Mon Sep 17 00:00:00 2001 From: Ian Maddaus Date: Thu, 14 Sep 2023 14:46:40 -0400 Subject: [PATCH] additional editing Signed-off-by: Ian Maddaus --- content/licensing/_index.md | 29 ++++++++++++++--------------- content/licensing/accept.md | 8 ++++++-- content/licensing/add_license.md | 20 ++++++++++++++++++++ go.mod | 2 +- 4 files changed, 41 insertions(+), 18 deletions(-) create mode 100644 content/licensing/add_license.md diff --git a/content/licensing/_index.md b/content/licensing/_index.md index 1a299ead06a..28216b893bf 100644 --- a/content/licensing/_index.md +++ b/content/licensing/_index.md @@ -15,13 +15,13 @@ aliases = ["/chef_license.html", "/chef_license/", "/license/"] weight = 10 +++ -With the release of Chef InSpec 6, Chef is introducing a new licensing model which will expand to cover to all Chef products at a future date. The new licensing model is more flexible and lets customers and end-users choose a license that adapts to their specific DevOps scenarios. +Commercial distributions of Chef products are governed by either the [Chef End User License Agreement (Chef EULA)](#chef-eula) or your commercial agreement with Progress Software Corporation. Chef licenses come in [three different license tiers](#license-tiers) depending on your use case. - +Before you use distributions of Chef products, you must [accept the Chef license](accept). You must also [add a license key](add_license) if you use the following products: -For all products, including Chef InSpec 6 and higher, the existing [Chef End User License Agreement (Chef EULA)](#chef-eula) still applies and is unchanged. +- Chef InSpec 6 or greater -Source code reuse is unchanged and follows the [Apache 2.0](#apache-20) model for open source products and repositories from Progress Chef. +Licensing is available for non-profit, research, and academic organizations through a special, free, or highly discounted commercial license in [Progress Chef's Non-Profit Entitlement Program](https://www.chef.io/nonprofit-entitlement-program). ## Licenses @@ -31,7 +31,11 @@ The commercial distributions of our products--such as Chef Infra Client, Chef Ha If you have a license from before April 2019 (referred to as the Chef Master License and Services Agreement, or MLSA), please consult the [Chef versions documentation](/versions/) to understand which license applies. -## Apache 2.0 +### Chef MLSA + +Distributions of older proprietary Chef products--such as Chef Automate 1.x and the Chef Management Console--are governed by the [Chef Master License and Services Agreement (Chef MLSA)](https://www.chef.io/online-master-agreement), which must be accepted as part of any install or upgrade process. + +### Apache 2.0 The [Apache License, Version 2.0](https://www.apache.org/licenses/LICENSE-2.0.txt) governs the reuse of source code of open-source Progress Chef projects--including Chef Infra Client ("chef"), Chef InSpec, and Chef Habitat--unless specified otherwise in the project's repository. Source code is released publicly through repositories in these organizations: @@ -48,8 +52,7 @@ For further questions, please contact [Chef Developer Relations](https://communi ## License tiers -Starting with Chef InSpec 6, there are three license tiers that have different entitlements: free, trial, and commercial. -Upon installation of Chef InSpec, you must accept the basic [Progress Chef EULA](https://www.chef.io/end-user-license-agreement) and then activate the product with a license key ID. Chef InSpec 6 doesn't run without a license. You can find your existing license key on the [customer support portal](https://community.progress.com/s/products-list). +Progress Chef offers three license tiers that have different entitlements: free, trial, and commercial. | License | Duration | Features | Intended environment | Support Model | Intended uses | |------------|------------------------------------|--------------------------------|-----------------------------------------|-----------------------------------------------------------|----------------------------------------------------| @@ -57,16 +60,12 @@ Upon installation of Chef InSpec, you must accept the basic [Progress Chef EULA] | Trial | 30-days, renewable up to 90 days | Advanced functionality enabled | Non-production workloads | Community support in Slack and solution architect support | Evaluate products in a non-production environment. | | Commercial | Renewable and upgradable | Advanced functionality enabled | Production and Non-production workloads | Support by contract | Enterprise workloads | -Licensing is available for non-profit, research, and academic organizations through a special, free, or highly discounted commercial license in [Progress Chef's Non-Profit Entitlement Program](https://www.chef.io/nonprofit-entitlement-program). - -Official downstream distributions made from original Chef distributions (for example, CINC) aren't affected by this license change. - -## Usage Data +## Usage data -The Progress Chef EULA requires basic license information to be transmitted to Chef for all products, including Chef InSpec 6. -The basic license information collected includes which applications are in use, Chef product versions, and the license(s) that govern those products. +The Progress Chef EULA requires that basic license information be transmitted to Chef for all products. +The basic license information collected includes which Chef applications are in use, their versions, and the license(s) that govern those products. -Licensed customer may opt to send additional telemetry and usage data to Progress Chef. +Licensed customers may opt to send additional telemetry and usage data to Progress Chef. This telemetry is used to tailor recommendations to customers, develop new features, and optimize the customer experience.