Skip to content

Commit 7f92a6a

Browse files
authored
Merge pull request #464 from github/lildude/update-docs
Update documentation for GitHub Enterprise Server name change
2 parents bdfc3a8 + 81ba2e9 commit 7f92a6a

File tree

6 files changed

+29
-28
lines changed

6 files changed

+29
-28
lines changed

docs/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
# GitHub Enterprise Backup Utilities Documentation
1+
# GitHub Enterprise Server Backup Utilities Documentation
22

33
- **[Requirements](requirements.md)**
44
- **[Backup host requirements](requirements.md#backup-host-requirements)**
55
- **[Storage requirements](requirements.md#storage-requirements)**
6-
- **[GitHub Enterprise version requirements](requirements.md#github-enterprise-version-requirements)**
6+
- **[GitHub Enterprise Server version requirements](requirements.md#github-enterprise-version-requirements)**
77
- **[Getting started](getting-started.md)**
88
- **[Using the backup and restore commands](usage.md)**
99
- **[Scheduling backups](scheduling-backups.md)**

docs/docker.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ github/backup-utils ghe-backup
3838

3939
## SSH Keys
4040

41-
A SSH private key that has been added to the GitHub Enterprise [Management Console
41+
A SSH private key that has been added to the GitHub Enterprise Server [Management Console
4242
for administrative SSH access][1] needs to be mounted into the container from the
4343
host system. It is also recommended to mount a SSH `.ssh/known_hosts` file into
4444
the container.
@@ -57,7 +57,7 @@ github/backup-utils ghe-backup
5757
### Using ssh-agent
5858

5959
If your SSH private key is protected with a passphrase, you can mount the `ssh-agent`
60-
socket from the Docker host into the GitHub Enterprise Backup Utilities image.
60+
socket from the Docker host into the GitHub Enterprise Server Backup Utilities image.
6161

6262
1. Start the ssh-agent in the background.
6363

docs/faq.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
## How does Backup Utilities differ from a High Availability replica?
44
It is recommended that both Backup Utilities and an [High Availability replica][1]
5-
are used as part of a GitHub Enterprise deployment but they serve different roles.
5+
are used as part of a GitHub Enterprise Server deployment but they serve different roles.
66

77
### The purpose of the High Availability replica
8-
The High Availability replica is a fully redundant secondary GitHub Enterprise
8+
The High Availability replica is a fully redundant secondary GitHub Enterprise Server
99
instance, kept in sync with the primary instance via replication of all major
1010
datastores. This active/passive cluster configuration is designed to minimize
1111
service disruption in the event of hardware failure or major network outage

docs/getting-started.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
`git clone -b stable https://github.com/github/backup-utils.git`
1010

1111
**Note**: you will need to use [Backup Utilities v2.11.x][2] or the `legacy` branch to
12-
backup and restore GitHub Enterprise 2.10 and earlier.
12+
backup and restore GitHub Enterprise Server 2.10 and earlier.
1313

1414
2. Copy the [`backup.config-example`][3] file to `backup.config` and modify as
15-
necessary. The `GHE_HOSTNAME` value must be set to the primary GitHub Enterprise
15+
necessary. The `GHE_HOSTNAME` value must be set to the primary GitHub Enterprise Server
1616
host name. Additional options are available and documented in the
1717
configuration file but none are required for basic backup functionality.
1818

docs/requirements.md

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Requirements
22

33
Backup Utilities should be run on a host dedicated to long-term permanent
4-
storage and must have network connectivity with the GitHub Enterprise appliance.
4+
storage and must have network connectivity with the GitHub Enterprise Server appliance.
55

66
## Backup host requirements
77

@@ -12,7 +12,7 @@ We encourage the use of [Docker](docker.md) if your backup host doesn't meet the
1212
requirements, or if Docker is your preferred platform.
1313

1414
The backup host must be able to establish outbound network connections to the
15-
GitHub appliance over SSH. TCP port 122 is used to backup GitHub Enterprise.
15+
GitHub appliance over SSH. TCP port 122 is used to backup GitHub Enterprise Server.
1616

1717
## Storage requirements
1818

@@ -22,31 +22,32 @@ of storage allocated to the primary GitHub appliance for historical snapshots
2222
and growth over time.
2323

2424
Backup Utilities use [hard links][5] to store data efficiently, and the
25-
repositories on GitHub Enterprise use [symbolic links][6] so the backup snapshots
25+
repositories on GitHub Enterprise Server use [symbolic links][6] so the backup snapshots
2626
must be written to a filesystem with support for symbolic and hard links.
2727

2828
Using a [case sensitive][7] file system is also required to avoid conflicts.
2929

30-
## GitHub Enterprise version requirements
30+
## GitHub Enterprise Server version requirements
3131

3232
Starting with Backup Utilities v2.13.0, version support is inline with that of the
33-
[GitHub Enterprise upgrade requirements][8] and as such, support is limited to
34-
three versions of GitHub Enterprise: the version that corresponds with the version
33+
[GitHub Enterprise Server upgrade requirements][8] and as such, support is limited to
34+
three versions of GitHub Enterprise Server: the version that corresponds with the version
3535
of Backup Utilities, and the two releases prior to it.
3636

3737
For example, Backup Utilities v2.13.0 can be used to backup and restore all patch
38-
releases from 2.11.0 to the latest patch release of GitHub Enterprise 2.13.
39-
Backup Utilities v2.14.0 will be released when GitHub Enterprise 2.14.0 is released
40-
and will then be used to backup all releases of GitHub Enterprise from 2.12.0
41-
to the latest patch release of GitHub Enterprise 2.14.
38+
releases from 2.11.0 to the latest patch release of GitHub Enterprise Server 2.13.
39+
Backup Utilities v2.14.0 will be released when GitHub Enterprise Server 2.14.0 is released
40+
and will then be used to backup all releases of GitHub Enterprise Server from 2.12.0
41+
to the latest patch release of GitHub Enterprise Server 2.14.
4242

43-
Backup Utilities v2.11.4 and earlier offer support for GitHub Enterprise 2.10
44-
and earlier releases.
43+
Backup Utilities v2.11.4 and earlier offer support for GitHub Enterprise Server 2.10
44+
and earlier releases up to GitHub Enterprise Server 2.2.0. Backup Utilities v2.11.0 and earlier
45+
offer support for GitHub Enterprise Server 2.1.0 and earlier.
4546

4647
**Note**: You can restore a snapshot that's at most two feature releases behind
47-
the restore target's version of GitHub Enterprise. For example, to restore a
48-
snapshot of GitHub Enterprise 2.11, the target GitHub Enterprise appliance must
49-
be running GitHub Enterprise 2.12.x or 2.13.x. You can't restore a snapshot from
48+
the restore target's version of GitHub Enterprise Server. For example, to restore a
49+
snapshot of GitHub Enterprise Server 2.11, the target GitHub Enterprise Server appliance must
50+
be running GitHub Enterprise Server 2.12.x or 2.13.x. You can't restore a snapshot from
5051
2.10 to 2.13, because that's three releases ahead.
5152

5253
[1]: https://www.gnu.org/software/bash/

docs/usage.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ After the initial backup, use the following commands:
66
along with full snapshots of all other pertinent data stores.
77
- The `ghe-restore` command restores snapshots to the same or separate GitHub
88
Enterprise appliance. You must add the backup host's SSH key to the target
9-
GitHub Enterprise appliance before using this command.
9+
GitHub Enterprise Server appliance before using this command.
1010

1111
These commands are run on the host you [installed][1] Backup Utilities on.
1212

@@ -36,7 +36,7 @@ Creating a backup snapshot:
3636
Checking for leaked ssh keys ...
3737
* No leaked keys found
3838

39-
Restoring from last successful snapshot to a newly provisioned GitHub Enterprise
39+
Restoring from last successful snapshot to a newly provisioned GitHub Enterprise Server
4040
appliance at IP "5.5.5.5":
4141

4242
$ ghe-restore 5.5.5.5
@@ -72,12 +72,12 @@ The `ghe-backup` and `ghe-restore` commands also have a verbose output mode
7272
(`-v`) that lists files as they're being transferred. It's often useful to
7373
enable when output is logged to a file.
7474

75-
When restoring to a new GitHub Enterprise instance, settings, certificate, and
75+
When restoring to a new GitHub Enterprise Server instance, settings, certificate, and
7676
license data *are* restored. These settings must be reviewed and saved before
77-
using the GitHub Enterprise to ensure all migrations take place and all required
77+
using the GitHub Enterprise Server to ensure all migrations take place and all required
7878
services are started.
7979

80-
When restoring to an already configured GitHub Enterprise instance, settings, certificate, and license data
80+
When restoring to an already configured GitHub Enterprise Server instance, settings, certificate, and license data
8181
are *not* restored to prevent overwriting manual configuration on the restore
8282
host. This behavior can be overridden by passing the `-c` argument to `ghe-restore`,
8383
forcing settings, certificate, and license data to be overwritten with the backup copy's data.

0 commit comments

Comments
 (0)