Skip to content

Commit

Permalink
Remove hosted chef from docs (#4354)
Browse files Browse the repository at this point in the history
* Remove hosted chef from docs

Signed-off-by: Ian Maddaus <[email protected]>

* Heading fix

Signed-off-by: Ian Maddaus <[email protected]>

---------

Signed-off-by: Ian Maddaus <[email protected]>
  • Loading branch information
IanMadd authored Jan 9, 2025
1 parent ab3ef77 commit 0a0c93d
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 35 deletions.
14 changes: 0 additions & 14 deletions config/_default/menu.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down
6 changes: 0 additions & 6 deletions content/chef_client_security.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 doesn't apply to Hosted Chef.

{{< /warning >}}

{{< readfile file="content/server/reusable/md/server_security_ssl_cert_client.md" >}}

### trusted_certs Directory
Expand Down
15 changes: 8 additions & 7 deletions content/chef_system_requirements.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,18 +26,19 @@ 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.
### Hardware requirements

### Hosted Chef Infra Server Requirements
Chef Infra Server has the following hardware 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.
{{< readfile file="content/server/reusable/md/system_requirements_server_hardware.md" >}}

### Chef Infra Server, On-premises or in Cloud Environment
### Software requirements

{{< readfile file="content/server/reusable/md/system_requirements_server_hardware.md" >}} {{< readfile file="content/server/reusable/md/system_requirements_server_software.md" >}}
Chef Infra Server has the following software requirements:

{{< readfile file="content/server/reusable/md/system_requirements_server_software.md" >}}

## Chef Infra Client

Expand Down
4 changes: 2 additions & 2 deletions content/config_rb_client.md
Original file line number Diff line number Diff line change
Expand Up @@ -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/<orgname>'
chef_server_url 'https://chef-server.example.com/organizations/ORGANIZATION'
validation_client_name '<orgname>-validator'
validation_key '/etc/chef/validator.pem'
client_key '/etc/chef/client.pem'
Expand Down
8 changes: 2 additions & 6 deletions content/server_orgs.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,12 @@ role-based access control:
<tbody>
<tr>
<td><p><img src="/images/icon_server_organization.svg" class="align-center" width="130" alt="" /></p></td>
<td>An organization is the top-level entity for role-based access control in the Chef Infra Server. Each organization contains the default groups (<code>admins</code>, <code>clients</code>, and <code>users</code>, plus <code>billing_admins</code> 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.</td>
<td>An organization is the top-level entity for role-based access control in the Chef Infra Server. Each organization contains the default groups (<code>admins</code>, <code>clients</code>, and <code>users</code>), 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.</td>
</tr>
<tr>
<td><p><img src="/images/icon_server_groups.svg" class="align-center" width="130" alt="" /></p></td>
<td><p>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.</p>
<p>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: <code>admins</code>, <code>clients</code>, and <code>users</code>. For users of the hosted Chef Infra Server, an additional default group is provided: <code>billing_admins</code>.</p></td>
<p>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: <code>admins</code>, <code>clients</code>, and <code>users</code>.</p></td>
</tr>
<tr>
<td><p><img src="/images/icon_server_users.svg" class="align-center" width="130" alt="" /></p></td>
Expand Down Expand Up @@ -210,10 +210,6 @@ The Chef Infra Server includes the following default groups:
<td>The <code>admins</code> group defines the list of users who have administrative rights to all objects and object types for a single organization.</td>
</tr>
<tr>
<td><code>billing_admins</code></td>
<td>The <code>billing_admins</code> group defines the list of users who have permission to manage billing information. This permission exists only for the hosted Chef Infra Server.</td>
</tr>
<tr>
<td><code>clients</code></td>
<td>The <code>clients</code> 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.</td>
</tr>
Expand Down

0 comments on commit 0a0c93d

Please sign in to comment.