diff --git a/_vendor/github.com/chef/chef-server/docs-chef-io/content/server/upgrades.md b/_vendor/github.com/chef/chef-server/docs-chef-io/content/server/upgrades.md index af6cfd0ffd..ab00f6c97e 100644 --- a/_vendor/github.com/chef/chef-server/docs-chef-io/content/server/upgrades.md +++ b/_vendor/github.com/chef/chef-server/docs-chef-io/content/server/upgrades.md @@ -194,7 +194,8 @@ The following External PostgreSQL upgrade steps are provided as a courtesy only. 1. Log into the Chef Infra Server machine. -1. Consult the documentation on [`knife-ec-backup`](https://blog.chef.io/migrating-chef-server-knife-ec-backup-knife-tidy).Please follow steps memntioned in this document for installing the product using the install.sh [Chef Software Install Script](/install_omnibus/) +1. Consult the documentation on [`knife-ec-backup`](https://blog.chef.io/migrating-chef-server-knife-ec-backup-knife-tidy). + {{< note >}} Please follow steps mentioned in this documentation [Chef Software Install Script](/install_omnibus/). Enter your license id in place of {{}} Install `knife-ec-backup`, if it not already installed. A sample session follows (note that your steps could differ, depending on the versions of your software, @@ -206,7 +207,7 @@ The following External PostgreSQL upgrade steps are provided as a courtesy only. apt-get update apt install ruby apt install make - curl -L https://chefdownload-commercial.chef.io/install.sh | sudo bash -s -- -P chef + curl -L https://chefdownload-commericial.chef.io/install.sh?license_id= | sudo bash -s -- -P chef export PATH=$PATH:/root/.chef/gem/ruby/2.6.0/bin apt-get -y install gcc postgresql libpq-dev /opt/chef/embedded/bin/gem install knife-ec-backup -- --with-pg-config=/opt/opscode/embedded/postgresql/9.6/bin/pg_config diff --git a/_vendor/github.com/inspec/inspec/docs-chef-io/content/inspec/install.md b/_vendor/github.com/inspec/inspec/docs-chef-io/content/inspec/install.md index 5553546a10..8348ceb9ec 100644 --- a/_vendor/github.com/inspec/inspec/docs-chef-io/content/inspec/install.md +++ b/_vendor/github.com/inspec/inspec/docs-chef-io/content/inspec/install.md @@ -19,10 +19,16 @@ To see which platforms and platform versions Chef InSpec is supported on, see th ### CLI -You can install Chef InSpec using a curl script. For more information please refer to this Document [Chef Software Install Script](/install_omnibus/) +You can install Chef InSpec using a curl script. + +{{< note >}} + +Please follow steps mentioned in this document [Chef Software Install Script](/install_omnibus/). Enter your licenseId in place of YOUR LICENSE ID. + +{{ }} ```bash -curl -L https://chefdownload-commercial.chef.io/install.sh?license_id= | sudo bash -s -- -P inspec +curl -L https://chefdownload-commericial.chef.io/install.sh?license_id= | sudo bash -s -- -P inspec ``` ## Windows @@ -34,10 +40,12 @@ then double-click on the `.msi` file to launch the installer and follow the prom ### Powershell -You can install Chef InSpec using a powershell script. For more information please refer to this Document [Chef Software Install Script](/install_omnibus/) +You can install Chef InSpec using a powershell script. + +{{< note >}}Please follow steps mentioned in this document [Chef Software Install Script](/install_omnibus/). Enter your licenseId in place of .{{ }} ```powershell -. { iwr -useb https://chefdownload-commercial.chef.io/install.ps1?license_id= } | iex; install -project inspec +. { iwr -useb https://chefdownload-commericial.chef.io/install.ps1?license_id= } | iex; install -project inspec ``` Once you have installed Chef InSpec, run `inspec version` to verify that the installation @@ -47,10 +55,15 @@ was successful. ### CLI -The following curl script will install Chef InSpec for Ubuntu and Red Hat Enterprise Linux. For more information please refer to this Document [Chef Software Install Script](/install_omnibus/) +The following curl script will install Chef InSpec for Ubuntu and Red Hat Enterprise Linux. +{{< note >}} + +Please follow steps mentioned in this document [Chef Software Install Script](/install_omnibus/). Enter your licenseId in place of YOUR LICENSE ID. + +{{ }} ```bash -curl -L https://chefdownload-commercial.chef.io/install.sh?license_id= | sudo bash -s -- -P inspec ``` If you prefer, you can use a package manager to install Chef InSpec. diff --git a/content/install_chef_air_gap.md b/content/install_chef_air_gap.md index 645d4f37b9..c454f87441 100644 --- a/content/install_chef_air_gap.md +++ b/content/install_chef_air_gap.md @@ -161,7 +161,7 @@ custom template, and then modify the package and Ruby gem sources. template file name, be sure to replace `airgap.erb` with the template file you created during the last step. -4. Update `airgap.erb` to replace `https://chefdownload-commercial.chef.io/install.sh?license_id=` with the URL of +4. Update `airgap.erb` to replace `https://chefdownload-commericial.chef.io/install.sh?license_id=` with the URL of `install.sh` on your artifact store: ```ruby diff --git a/content/reusable/md/packages_install_script_examples.md b/content/reusable/md/packages_install_script_examples.md index 1f7dc628e1..b7fcff247b 100644 --- a/content/reusable/md/packages_install_script_examples.md +++ b/content/reusable/md/packages_install_script_examples.md @@ -1,16 +1,26 @@ The following examples show how to use the Chef Software Install script. -To install Chef Inspec 6.6.0: +To install Infra Client 15.8.23: + +{{< note >}} + +Enter your licenseId in place of YOUR LICENSE ID + +{{< /note >}} ```bash -curl -L https://chefdownload-commercial.chef.io/install.sh?license_id= | sudo bash -s -- -v 6.6.0 +curl -L https://chefdownload-commericial.chef.io/install.sh?license_id= | sudo bash -s -- -v 15.8.23 ``` To install the latest version of Chef Workstation on Windows from the `current` channel: +{{< note >}} + +Enter your licenseId in place of YOUR LICENSE ID + +{{< /note >}} + ```powershell -. { iwr -useb https://chefdownload-commercial.chef.io/install.ps1?license_id= } | iex; install -channel stable -project inspec -version 6.6.0 +. { iwr -useb https://chefdownload-commericial.chef.io/install.ps1?license_id= } | iex; install -channel current -project chef-workstation ``` - -enter your licenseId in the place of YOUR LICENSE ID diff --git a/content/reusable/md/packages_install_script_run_unix_linux.md b/content/reusable/md/packages_install_script_run_unix_linux.md index 3b6697a649..818b113137 100644 --- a/content/reusable/md/packages_install_script_run_unix_linux.md +++ b/content/reusable/md/packages_install_script_run_unix_linux.md @@ -2,14 +2,22 @@ On UNIX, Linux, and macOS systems, invoke the Chef Software Install script with: - For Commercial Persona use +{{< note >}} +Please replace YOUR LICENSE ID with your licenseId. +{{< /note >}} + ```bash -curl -L https://chefdownload-commercial.chef.io/install.sh?license_id= | sudo bash +curl -L https://chefdownload-commericial.chef.io/install.sh?license_id= | sudo bash ``` - For Trial Persona use +{{< note >}} +For Trial Persona license Id is not mandatory please add if you have one. Please replace YOUR LICENSE ID with your licenseId. +{{< /note >}} + ```bash -curl -L https://chefdownload-trial.chef.io/install.sh | sudo bash +curl -L https://chefdownload-trial.chef.io/install.sh?license_id= | sudo bash ``` - For Community Persona use @@ -17,5 +25,3 @@ curl -L https://chefdownload-trial.chef.io/install.sh | sudo bash ```bash curl -L https://chefdownload-community.chef.io/install.sh | sudo bash ``` - -enter your licenseId in the place of YOUR LICENSE ID diff --git a/content/reusable/md/packages_install_script_run_windows.md b/content/reusable/md/packages_install_script_run_windows.md index 44aa2ada22..eca5911964 100644 --- a/content/reusable/md/packages_install_script_run_windows.md +++ b/content/reusable/md/packages_install_script_run_windows.md @@ -3,14 +3,18 @@ Windows PowerShell: - For Commercial Persona use +{{< note >}}Please replace YOUR LICENSE ID with your licenseId.{{< /note >}} + ```powershell -. { iwr -useb https://chefdownload-commercial.chef.io/install.ps1?license_id= } | iex; install +. { iwr -useb https://chefdownload-commericial.chef.io/install.ps1?license_id= } | iex; install ``` - For Trial Persona use +{{< note >}}For Trial Persona licene Id is not mandatory please add if you have one. Please replace YOUR LICENSE ID with your licenseId.{{< /note >}} + ```powershell -. { iwr -useb https://chefdownload-trial.chef.io/install.ps1 } | iex; install +. { iwr -useb https://chefdownload-trial.chef.io/install.ps1?license_id= } | iex; install ``` - For Community Persona use @@ -18,5 +22,3 @@ Windows PowerShell: ```powershell . { iwr -useb https://chefdownload-community.chef.io/install.ps1 } | iex; install ``` - -enter your licenseId in the place of YOUR LICENSE ID diff --git a/content/upgrade_client.md b/content/upgrade_client.md index 7d7cb43942..c9307c12a7 100644 --- a/content/upgrade_client.md +++ b/content/upgrade_client.md @@ -24,14 +24,26 @@ Please follow steps mentioned in this document [Chef Software Install Script](/i Linux, macOS, and Unix-based hosts: +{{< note >}} + +Please follow steps mentioned in this document [Chef Software Install Script](/install_omnibus/).Enter your licenseId in place of YOUR LICENSE ID + +{{< /note >}} + ```bash -curl -L https://chef.io/chef/install.sh | sudo bash +curl -L https://chefdownload-commericial.chef.io/install.sh?license_id=| sudo bash ``` Windows hosts: +{{< note >}} + +Please follow steps mentioned in this document [Chef Software Install Script](/install_omnibus/).Enter your licenseId in place of YOUR LICENSE ID + +{{< /note >}} + ```powershell -. { iwr -useb https://chefdownload-commercial.chef.io/install.ps1?license_id= } | iex; install +. { iwr -useb https://chefdownload-commericial.chef.io/install.ps1?license_id= } | iex; install ``` ### Specifying the Version to Install @@ -43,13 +55,13 @@ Please follow steps mentioned in this document [Chef Software Install Script](/i Linux, macOS, and Unix-based hosts: ```bash -curl -L https://chefdownload-commercial.chef.io/install.sh?license_id= | sudo bash -s -- -v 17.9.26 +curl -L https://chefdownload-commericial.chef.io/install.sh?license_id= | sudo bash -s -- -v 17.9.26 ``` Windows hosts: ```powershell -. { iwr -useb https://chefdownload-commercial.chef.io/install.ps1?license_id= } | iex; install -version 17.9.26 +. { iwr -useb https://chefdownload-commericial.chef.io/install.ps1?license_id= } | iex; install -version 17.9.26 ``` ### Upgrading Multiple Hosts with Knife @@ -57,7 +69,7 @@ Windows hosts: The `knife ssh` command in Chef Workstation can be used to execute the install script on multiple Linux, macOS, and Unix-based hosts at once: ```bash -knife ssh 'name:*' 'curl -L https://chefdownload-commercial.chef.io/install.sh?license_id= | sudo bash' +knife ssh 'name:*' 'curl -L https://chefdownload-commericial.chef.io/install.sh?license_id= | sudo bash' ``` enter your licenseId in the place of YOUR LICENSE ID