From 05c7449e3da7aaea57c09d1bbe95e16431c91669 Mon Sep 17 00:00:00 2001 From: Ian Maddaus Date: Mon, 9 Dec 2024 16:01:28 -0500 Subject: [PATCH] Remove hosted chef from docs Signed-off-by: Ian Maddaus --- config/_default/menu.toml | 14 -------------- content/chef_client_security.md | 6 ------ content/chef_system_requirements.md | 14 +++----------- content/config_rb_client.md | 4 ++-- content/server_orgs.md | 8 ++------ 5 files changed, 7 insertions(+), 39 deletions(-) diff --git a/config/_default/menu.toml b/config/_default/menu.toml index 17b5c9bc43..1eafa5c34d 100644 --- a/config/_default/menu.toml +++ b/config/_default/menu.toml @@ -370,13 +370,6 @@ identifier = "server" parent = "server" weight = 10 - [[server]] - title = "Hosted Chef Server" - identifier = "server/overview/Hosted Chef Server" - parent = "server/overview" - url = "https://manage.chef.io/signup" - weight = 70 - [[server]] title = "Plan" identifier = "server/planning" @@ -396,13 +389,6 @@ identifier = "server" URL = "/install_chef_air_gap/#chef-infra-server" weight = 30 - [[server]] - title = "Hosted Chef Server" - identifier = "server/installation/Hosted Chef Server" - parent = "server/installation" - URL = "https://manage.chef.io/signup" - weight = 40 - [[server]] title = "Configure" identifier = "server/configure" diff --git a/content/chef_client_security.md b/content/chef_client_security.md index fedd27e993..8da74c9a82 100644 --- a/content/chef_client_security.md +++ b/content/chef_client_security.md @@ -29,12 +29,6 @@ aliases = ["/chef_client_security.html", "/auth.html"] ## SSL Certificates -{{< warning >}} - -The following information applies to on-premises Chef Infra Server and does not apply to Hosted Chef. - -{{< /warning >}} - {{< readfile file="content/server/reusable/md/server_security_ssl_cert_client.md" >}} ### trusted_certs Directory diff --git a/content/chef_system_requirements.md b/content/chef_system_requirements.md index 204ef845da..d89710a434 100644 --- a/content/chef_system_requirements.md +++ b/content/chef_system_requirements.md @@ -26,18 +26,10 @@ Install and configure the Chef Infra Server, then install and configure Chef Workstation, and then run the bootstrap command from Chef Workstation to install Chef Infra Client on each node. -## The Chef Infra Server +## Chef Infra Server -The following sections describe the various requirements for the Chef -Infra Server. - -### Hosted Chef Infra Server Requirements - -Every node that will be configured by Chef Infra Client and every workstation that will upload data to the Chef Infra Server must be able to communicate with the hosted Chef server. - -### Chef Infra Server, On-premises or in Cloud Environment - -{{< readfile file="content/server/reusable/md/system_requirements_server_hardware.md" >}} {{< readfile file="content/server/reusable/md/system_requirements_server_software.md" >}} +{{< readfile file="content/server/reusable/md/system_requirements_server_hardware.md" >}} +{{< readfile file="content/server/reusable/md/system_requirements_server_software.md" >}} ## Chef Infra Client diff --git a/content/config_rb_client.md b/content/config_rb_client.md index a41c5ea0a0..b81f2d80d2 100644 --- a/content/config_rb_client.md +++ b/content/config_rb_client.md @@ -585,10 +585,10 @@ This configuration file has the following settings: ## Example -A sample client.rb file that contains the most simple way to connect to Hosted Chef +The following `client.rb` file shows the simplest way to connect to Chef Infra Server: ```ruby -chef_server_url 'https://api.chef.io/organizations/' +chef_server_url 'https://chef-server.example.com/organizations/ORGANIZATION' validation_client_name '-validator' validation_key '/etc/chef/validator.pem' client_key '/etc/chef/client.pem' diff --git a/content/server_orgs.md b/content/server_orgs.md index 8528786335..7ecf48dad3 100644 --- a/content/server_orgs.md +++ b/content/server_orgs.md @@ -31,12 +31,12 @@ role-based access control:

-An organization is the top-level entity for role-based access control in the Chef Infra Server. Each organization contains the default groups (admins, clients, and users, plus billing_admins for the hosted Chef Infra Server), at least one user and at least one node (on which the Chef Infra Client is installed). The Chef Infra Server supports multiple organizations. The Chef Infra Server includes a single default organization that's defined during setup. Additional organizations can be created after the initial setup and configuration of the Chef Infra Server. +An organization is the top-level entity for role-based access control in the Chef Infra Server. Each organization contains the default groups (admins, clients, and users), at least one user and at least one node (on which the Chef Infra Client is installed). The Chef Infra Server supports multiple organizations. The Chef Infra Server includes a single default organization that's defined during setup. Additional organizations can be created after the initial setup and configuration of the Chef Infra Server.

A group is used to define access to object types and objects in the Chef Infra Server and also to assign permissions that determine what types of tasks are available to members of that group who are authorized to perform them. Groups are configured by organization.

-

Individual users who are members of a group will inherit the permissions assigned to the group. The Chef Infra Server includes the following default groups: admins, clients, and users. For users of the hosted Chef Infra Server, an additional default group is provided: billing_admins.

+

Individual users who are members of a group will inherit the permissions assigned to the group. The Chef Infra Server includes the following default groups: admins, clients, and users.

@@ -210,10 +210,6 @@ The Chef Infra Server includes the following default groups: The admins group defines the list of users who have administrative rights to all objects and object types for a single organization. -billing_admins -The billing_admins group defines the list of users who have permission to manage billing information. This permission exists only for the hosted Chef Infra Server. - - clients The clients group defines the list of nodes on which a Chef Infra Client is installed and under management by Chef. In general, think of this permission as "all of the non-human actors---Chef Infra Client, in almost every case---that get data from, and/or upload data to, Chef Infra Server." Newly-created Chef Infra Client instances are added to this group automatically.