Skip to content

Commit

Permalink
Merge branch 'main' into repo-sync
Browse files Browse the repository at this point in the history
  • Loading branch information
Octomerger authored Oct 19, 2021
2 parents a6a002e + 495e8f1 commit 7abe04b
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 6 deletions.
4 changes: 2 additions & 2 deletions content/admin/overview/system-overview.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ topics:

The root filesystem is included in the distributed machine image. It contains the base operating system and the {% data variables.product.prodname_ghe_server %} application environment. The root filesystem should be treated as ephemeral. Any data on the root filesystem will be replaced when upgrading to future {% data variables.product.prodname_ghe_server %} releases.

The root storage volume is split into two equally-sized partitions. One of the partitions will be mounted as the root filesystem (`/`). The other partition is only mounted during upgrades and rollbacks of upgrades as `/mnt/upgrade`, to facilitate easier rollbacks if necessary. For example, if a 200GB root volume is allocated, there will be 100GB allocated to the root filesystem and 100GB reserved for the upgrades and rollbacks.

The root filesystem contains:
- Custom certificate authority (CA) certificates (in */usr/local/share/ca-certificates*)
- Custom networking configurations
Expand All @@ -35,8 +37,6 @@ The user filesystem contains user configuration and data, such as:
- Large files from {% data variables.large_files.product_name_long %}
- Pre-receive hook environments

{% data reusables.enterprise_installation.root-disk-partition %}

## Deployment options

You can deploy {% data variables.product.prodname_ghe_server %} as a single virtual appliance, or in a high availability configuration. For more information, see "[Configuring {% data variables.product.prodname_ghe_server %} for High Availability](/enterprise/{{ currentVersion }}/admin/guides/installation/configuring-github-enterprise-server-for-high-availability/)."
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ To configure{% ifversion ghes = 2.22 %} the beta of{% endif %} {% data variables

{% endif %}

You can resize your instance's root disk by building a new instance or using an existing instance. For more information, see "[Increasing storage capacity](/enterprise/{{ currentVersion }}/admin/guides/installation/increasing-storage-capacity)."
The available space on the root filesystem will be 50% of the total disk size. You can resize your instance's root disk by building a new instance or using an existing instance. For more information, see "[System overview](/enterprise/admin/guides/installation/system-overview#storage-architecture)" and "[Increasing storage capacity](/enterprise/{{ currentVersion }}/admin/guides/installation/increasing-storage-capacity)."

### CPU and memory

Expand Down
2 changes: 0 additions & 2 deletions data/reusables/enterprise_installation/hardware-rec-table.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@

{% endif %}

{% data reusables.enterprise_installation.root-disk-partition %}

{% ifversion ghes > 2.22 %}

If you plan to enable {% data variables.product.prodname_actions %} for the users of your instance, review the requirements for hardware, external storage, and runners in "[Getting started with {% data variables.product.prodname_actions %} for {% data variables.product.prodname_ghe_server %}](/admin/github-actions/getting-started-with-github-actions-for-github-enterprise-server)."
Expand Down

This file was deleted.

0 comments on commit 7abe04b

Please sign in to comment.