Skip to content

Commit 15dffb7

Browse files
authored
Merge pull request #39304 from github/repo-sync
Repo sync
2 parents 2dca269 + 6467e89 commit 15dffb7

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

content/admin/backing-up-and-restoring-your-instance/backup-service-for-github-enterprise-server/configuring-the-backup-service.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Before configuring the backup service, ensure you have:
2121

2222
To ensure reliable and performant backups, your storage must meet the following requirements:
2323

24-
* **Capacity:** Allocate at least five times the amount of storage used by your primary {% data variables.product.github %} appliance disk. This accounts for historical snapshots and future growth.
24+
* **Capacity:** Allocate at least five times the amount of storage used by your primary {% data variables.product.github %} appliance data disk. This accounts for historical snapshots and future growth.
2525
* **Filesystem support:** The backup service uses hard links for efficient storage, and your {% data variables.product.github %} instance uses symbolic links. The backup target must support both symbolic and hard links, and it must use a case-sensitive filesystem to prevent conflicts.
2626

2727
You can test whether your filesystem supports hardlinking symbolic links by running:

content/admin/configuring-settings/hardening-security-for-your-enterprise/restricting-network-traffic-to-your-enterprise-with-an-ip-allow-list.md

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ redirect_from:
2323

2424
By default, authorized users can access your enterprise's resources from any IP address. You can restrict access to your enterprise's private resources by configuring a list that allows or denies access from specific IP addresses. {% data reusables.identity-and-permissions.ip-allow-lists-example-and-restrictions %}
2525

26+
> [!NOTE]
27+
> If your enterprise uses {% data variables.product.prodname_emus %}, enabling the IP allow list does not restrict user provisioning actions performed through SAML/SCIM, OpenID Connect (OIDC) with Entra ID, or via REST API endpoints. For more information, see [AUTOTITLE](/admin/managing-iam/provisioning-user-accounts-with-scim).
28+
2629
If your enterprise uses {% data variables.product.prodname_emus %} with Microsoft Entra ID (previously known as Azure AD) and OIDC, you can choose whether to use {% data variables.product.company_short %}'s IP allow list feature or to use the allow list restrictions for your identity provider (IdP). If your enterprise does not use {% data variables.product.prodname_emus %} with Azure and OIDC, you can use {% data variables.product.company_short %}'s allow list feature.
2730

2831
{% data reusables.identity-and-permissions.ip-allow-lists-which-resources-are-protected %}
@@ -56,8 +59,8 @@ To ensure seamless use of the OIDC CAP while still applying the policy to OAuth
5659
{% data reusables.enterprise-accounts.access-enterprise %}
5760
{% data reusables.profile.org_settings %}
5861
{% data reusables.organizations.security %}
59-
1. If you're using {% data variables.product.prodname_emus %} with OIDC, under "IP allow list", select the **IP allow list configuration** dropdown menu and click **GitHub**.
60-
1. Under "IP allow list", select **Enable IP allow list**.
62+
1. If you're using {% data variables.product.prodname_emus %} with OIDC, under "IP allow list," select the **IP allow list configuration** dropdown menu and click **GitHub**.
63+
1. Under "IP allow list," select **Enable IP allow list**.
6164
1. Click **Save**.
6265

6366
### Adding an allowed IP address
@@ -119,7 +122,7 @@ To ensure seamless use of the OIDC CAP while still applying the policy to OAuth
119122
{% data reusables.enterprise-accounts.access-enterprise %}
120123
{% data reusables.profile.org_settings %}
121124
{% data reusables.organizations.security %}
122-
1. Under "IP allow list", select the **IP allow list configuration** dropdown menu and click **Identity Provider**.
125+
1. Under "IP allow list," select the **IP allow list configuration** dropdown menu and click **Identity Provider**.
123126
1. Optionally, to allow installed {% data variables.product.company_short %} and {% data variables.product.prodname_oauth_apps %} to access your enterprise from any IP address, select **Skip IdP check for applications**.
124127
1. Click **Save**.
125128

0 commit comments

Comments
 (0)