Skip to content

Commit 0a0c93d

Browse files
authored
Remove hosted chef from docs (#4354)
* 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]>
1 parent ab3ef77 commit 0a0c93d

File tree

5 files changed

+12
-35
lines changed

5 files changed

+12
-35
lines changed

config/_default/menu.toml

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -370,13 +370,6 @@ identifier = "server"
370370
parent = "server"
371371
weight = 10
372372

373-
[[server]]
374-
title = "Hosted Chef Server"
375-
identifier = "server/overview/Hosted Chef Server"
376-
parent = "server/overview"
377-
url = "https://manage.chef.io/signup"
378-
weight = 70
379-
380373
[[server]]
381374
title = "Plan"
382375
identifier = "server/planning"
@@ -396,13 +389,6 @@ identifier = "server"
396389
URL = "/install_chef_air_gap/#chef-infra-server"
397390
weight = 30
398391

399-
[[server]]
400-
title = "Hosted Chef Server"
401-
identifier = "server/installation/Hosted Chef Server"
402-
parent = "server/installation"
403-
URL = "https://manage.chef.io/signup"
404-
weight = 40
405-
406392
[[server]]
407393
title = "Configure"
408394
identifier = "server/configure"

content/chef_client_security.md

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,6 @@ aliases = ["/chef_client_security.html", "/auth.html"]
2929

3030
## SSL Certificates
3131

32-
{{< warning >}}
33-
34-
The following information applies to on-premises Chef Infra Server and doesn't apply to Hosted Chef.
35-
36-
{{< /warning >}}
37-
3832
{{< readfile file="content/server/reusable/md/server_security_ssl_cert_client.md" >}}
3933

4034
### trusted_certs Directory

content/chef_system_requirements.md

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,18 +26,19 @@ Install and configure the Chef Infra Server, then install and configure
2626
Chef Workstation, and then run the bootstrap command from Chef
2727
Workstation to install Chef Infra Client on each node.
2828

29-
## The Chef Infra Server
29+
## Chef Infra Server
3030

31-
The following sections describe the various requirements for the Chef
32-
Infra Server.
31+
### Hardware requirements
3332

34-
### Hosted Chef Infra Server Requirements
33+
Chef Infra Server has the following hardware requirements:
3534

36-
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.
35+
{{< readfile file="content/server/reusable/md/system_requirements_server_hardware.md" >}}
3736

38-
### Chef Infra Server, On-premises or in Cloud Environment
37+
### Software requirements
3938

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

4243
## Chef Infra Client
4344

content/config_rb_client.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -585,10 +585,10 @@ This configuration file has the following settings:
585585

586586
## Example
587587

588-
A sample client.rb file that contains the most simple way to connect to Hosted Chef
588+
The following `client.rb` file shows the simplest way to connect to Chef Infra Server:
589589

590590
```ruby
591-
chef_server_url 'https://api.chef.io/organizations/<orgname>'
591+
chef_server_url 'https://chef-server.example.com/organizations/ORGANIZATION'
592592
validation_client_name '<orgname>-validator'
593593
validation_key '/etc/chef/validator.pem'
594594
client_key '/etc/chef/client.pem'

content/server_orgs.md

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ role-based access control:
3131
<tbody>
3232
<tr>
3333
<td><p><img src="/images/icon_server_organization.svg" class="align-center" width="130" alt="" /></p></td>
34-
<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>
34+
<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>
3535
</tr>
3636
<tr>
3737
<td><p><img src="/images/icon_server_groups.svg" class="align-center" width="130" alt="" /></p></td>
3838
<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>
39-
<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>
39+
<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>
4040
</tr>
4141
<tr>
4242
<td><p><img src="/images/icon_server_users.svg" class="align-center" width="130" alt="" /></p></td>
@@ -210,10 +210,6 @@ The Chef Infra Server includes the following default groups:
210210
<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>
211211
</tr>
212212
<tr>
213-
<td><code>billing_admins</code></td>
214-
<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>
215-
</tr>
216-
<tr>
217213
<td><code>clients</code></td>
218214
<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>
219215
</tr>

0 commit comments

Comments
 (0)