Skip to content

Commit c94e6ba

Browse files
authored
Bug fixes for Enterprise content, 2021-11-26 (#23150)
1 parent aafa858 commit c94e6ba

8 files changed

Lines changed: 13 additions & 12 deletions

File tree

content/admin/configuration/configuring-network-settings/network-ports.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ Some administrative ports are required to configure {% data variables.product.pr
2626
|---|---|---|
2727
| 8443 | HTTPS | Secure web-based {% data variables.enterprise.management_console %}. Required for basic installation and configuration. |
2828
| 8080 | HTTP | Plain-text web-based {% data variables.enterprise.management_console %}. Not required unless SSL is disabled manually. |
29-
| 122 | SSH | Shell access for {% data variables.product.product_location %}. Required to be open to incoming connections from all other nodes in a High Availability configuration. The default SSH port (22) is dedicated to Git and SSH application network traffic. |
30-
| 1194/UDP | VPN | Secure replication network tunnel in High Availability configuration. Required to be open to all other nodes in the configuration.|
29+
| 122 | SSH | Shell access for {% data variables.product.product_location %}. Required to be open to incoming connections between all nodes in a high availability configuration. The default SSH port (22) is dedicated to Git and SSH application network traffic. |
30+
| 1194/UDP | VPN | Secure replication network tunnel in high availability configuration. Required to be open for communication between all nodes in the configuration.|
3131
| 123/UDP| NTP | Required for time protocol operation. |
3232
| 161/UDP | SNMP | Required for network monitoring protocol operation. |
3333

content/admin/enterprise-management/configuring-high-availability/about-high-availability-configuration.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,3 +186,4 @@ The `ghe-repl-teardown` command disables replication mode completely, removing t
186186
## Further reading
187187
188188
- "[Creating a high availability replica](/enterprise/{{ currentVersion }}/admin/guides/installation/creating-a-high-availability-replica)"
189+
- "[Network ports](/admin/configuration/configuring-network-settings/network-ports)"

content/admin/enterprise-management/configuring-high-availability/creating-a-high-availability-replica.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,16 @@ shortTitle: Create HA replica
1919
## Creating a high availability replica
2020

2121
1. Set up a new {% data variables.product.prodname_ghe_server %} appliance on your desired platform. The replica appliance should mirror the primary appliance's CPU, RAM, and storage settings. We recommend that you install the replica appliance in an independent environment. The underlying hardware, software, and network components should be isolated from those of the primary appliance. If you are a using a cloud provider, use a separate region or zone. For more information, see ["Setting up a {% data variables.product.prodname_ghe_server %} instance"](/enterprise/{{ currentVersion }}/admin/guides/installation/setting-up-a-github-enterprise-server-instance).
22-
2. In a browser, navigate to the new replica appliance's IP address and upload your {% data variables.product.prodname_enterprise %} license.
22+
1. Ensure that both the primary appliance and the new replica appliance can communicate with each other over ports 122/TCP and 1194/UDP. For more information, see "[Network ports](/admin/configuration/configuring-network-settings/network-ports#administrative-ports)."
23+
1. In a browser, navigate to the new replica appliance's IP address and upload your {% data variables.product.prodname_enterprise %} license.
2324
{% data reusables.enterprise_installation.replica-steps %}
24-
6. Connect to the replica appliance's IP address using SSH.
25+
1. Connect to the replica appliance's IP address using SSH.
2526
```shell
2627
$ ssh -p 122 admin@<em>REPLICA IP</em>
2728
```
2829
{% data reusables.enterprise_installation.generate-replication-key-pair %}
2930
{% data reusables.enterprise_installation.add-ssh-key-to-primary %}
30-
9. To verify the connection to the primary and enable replica mode for the new replica, run `ghe-repl-setup` again.
31+
1. To verify the connection to the primary and enable replica mode for the new replica, run `ghe-repl-setup` again.
3132
```shell
3233
$ ghe-repl-setup <em>PRIMARY IP</em>
3334
```

content/admin/policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-github-actions-in-your-enterprise.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,7 @@ You can choose to disable {% data variables.product.prodname_actions %} for all
6969

7070
{% data reusables.actions.about-artifact-log-retention %}
7171

72-
{% data reusables.enterprise_site_admin_settings.access-settings %}
73-
{% data reusables.enterprise_site_admin_settings.business %}
72+
{% data reusables.enterprise-accounts.access-enterprise %}
7473
{% data reusables.enterprise-accounts.policies-tab %}
7574
{% data reusables.enterprise-accounts.actions-tab %}
7675
{% data reusables.github-actions.change-retention-period-for-artifacts-logs %}

content/organizations/organizing-members-into-teams/managing-code-review-settings-for-your-team.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ Any team members that have set their status to "Busy" will not be selected for r
7979
![Routing algorithm dropdown](/assets/images/help/teams/review-assignment-algorithm.png)
8080
9. Optionally, to always skip certain members of the team, select **Never assign certain team members**. Then, select one or more team members you'd like to always skip.
8181
![Never assign certain team members checkbox and dropdown](/assets/images/help/teams/review-assignment-skip-members.png)
82-
{% ifversion fpt or ghec or ghae-next or ghes > 3.2 %}
82+
{% ifversion fpt or ghec or ghae-issue-5108 or ghes > 3.2 %}
8383
11. Optionally, to include members of child teams as potential reviewers when assigning requests, select **Child team members**.
8484
12. Optionally, to count any members whose review has already been requested against the total number of members to assign, select **Count existing requests**.
8585
13. Optionally, to remove the review request from the team when assigning team members, select **Team review request**.

content/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/about-protected-branches.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ By default, the restrictions of a branch protection rule don't apply to people w
4242
For each branch protection rule, you can choose to enable or disable the following settings.
4343
- [Require pull request reviews before merging](#require-pull-request-reviews-before-merging)
4444
- [Require status checks before merging](#require-status-checks-before-merging)
45-
{% ifversion fpt or ghes > 3.1 or ghae-issue-4382 or ghec %}
45+
{% ifversion fpt or ghes > 3.1 or ghae-next or ghec %}
4646
- [Require conversation resolution before merging](#require-conversation-resolution-before-merging){% endif %}
4747
- [Require signed commits](#require-signed-commits)
4848
- [Require linear history](#require-linear-history)
@@ -99,7 +99,7 @@ You can set up required status checks to either be "loose" or "strict." The type
9999

100100
For troubleshooting information, see "[Troubleshooting required status checks](/github/administering-a-repository/troubleshooting-required-status-checks)."
101101

102-
{% ifversion fpt or ghes > 3.1 or ghae-issue-4382 or ghec %}
102+
{% ifversion fpt or ghes > 3.1 or ghae-next or ghec %}
103103
### Require conversation resolution before merging
104104

105105
Requires all comments on the pull request to be resolved before it can be merged to a protected branch. This ensures that all comments are addressed or acknowledged before merge.

content/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/managing-a-branch-protection-rule.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ When you create a branch rule, the branch you specify doesn't have to exist yet
8080
![Loose or strict required status checkbox](/assets/images/help/repository/protecting-branch-loose-status.png)
8181
- Search for status checks, selecting the checks you want to require.
8282
![Search interface for available status checks, with list of required checks](/assets/images/help/repository/required-statuses-list.png)
83-
{%- ifversion fpt or ghes > 3.1 or ghae-issue-4382 %}
83+
{%- ifversion fpt or ghes > 3.1 or ghae-next %}
8484
1. Optionally, select **Require conversation resolution before merging**.
8585
![Require conversation resolution before merging option](/assets/images/help/repository/require-conversation-resolution.png)
8686
{%- endif %}

content/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ Each CODEOWNERS file assigns the code owners for a single branch in the reposito
3737

3838
For code owners to receive review requests, the CODEOWNERS file must be on the base branch of the pull request. For example, if you assign `@octocat` as the code owner for *.js* files on the `gh-pages` branch of your repository, `@octocat` will receive review requests when a pull request with changes to *.js* files is opened between the head branch and `gh-pages`.
3939

40-
{% ifversion fpt or ghae or ghes > 3.2 or ghec %}
40+
{% ifversion fpt or ghec or ghes > 3.2 or ghae-issue-9273 %}
4141
## CODEOWNERS file size
4242

4343
CODEOWNERS files must be under 3 MB in size. A CODEOWNERS file over this limit will not be loaded, which means that code owner information is not shown and the appropriate code owners will not be requested to review changes in a pull request.

0 commit comments

Comments
 (0)