From f54c9847bc164b82ecad9e370b331afe30d59a2d Mon Sep 17 00:00:00 2001 From: Jacob Wallraff Date: Thu, 14 Nov 2024 02:55:52 -0800 Subject: [PATCH 1/2] Fix check for CI/CD admin role (#53074) Co-authored-by: Sophie <29382425+sophietheking@users.noreply.github.com> --- data/reusables/organizations/pre-defined-organization-roles.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/reusables/organizations/pre-defined-organization-roles.md b/data/reusables/organizations/pre-defined-organization-roles.md index d608e5d29bda..6981b8661440 100644 --- a/data/reusables/organizations/pre-defined-organization-roles.md +++ b/data/reusables/organizations/pre-defined-organization-roles.md @@ -7,6 +7,6 @@ The current set of pre-defined roles are: * **All-repository triage**: Grants triage access to all repositories in the organization. * **All-repository maintain**: Grants maintenance access to all repositories in the organization. * **All-repository admin**: Grants admin access to all repositories in the organization. -{%- ifversion ghes > 3.15 %} +{%- ifversion fpt or ghec or ghes > 3.15 %} * **CI/CD admin**: Grants admin access to manage Actions policies, runners, runner groups, hosted compute network configurations, secrets, variables, and usage metrics for an organization. {%- endif %} From 06e03115a0cc0bfcabd6d5bb28c6efb89ada9a66 Mon Sep 17 00:00:00 2001 From: Kensuke Nagae Date: Thu, 14 Nov 2024 20:08:44 +0900 Subject: [PATCH 2/2] Update "Backing up and restoring GitHub Enterprise Server with GitHub Actions enabled" (#53067) Co-authored-by: Sophie <29382425+sophietheking@users.noreply.github.com> --- ...rise-server-with-github-actions-enabled.md | 20 ++----------------- 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/content/admin/managing-github-actions-for-your-enterprise/advanced-configuration-and-troubleshooting/backing-up-and-restoring-github-enterprise-server-with-github-actions-enabled.md b/content/admin/managing-github-actions-for-your-enterprise/advanced-configuration-and-troubleshooting/backing-up-and-restoring-github-enterprise-server-with-github-actions-enabled.md index 5b2a4f9b1783..1856b7769df8 100644 --- a/content/admin/managing-github-actions-for-your-enterprise/advanced-configuration-and-troubleshooting/backing-up-and-restoring-github-enterprise-server-with-github-actions-enabled.md +++ b/content/admin/managing-github-actions-for-your-enterprise/advanced-configuration-and-troubleshooting/backing-up-and-restoring-github-enterprise-server-with-github-actions-enabled.md @@ -25,24 +25,8 @@ However, not all the data for {% data variables.product.prodname_actions %} is i To restore a backup of {% data variables.location.product_location %} with {% data variables.product.prodname_actions %}, you must manually configure network settings and external storage on the destination instance before you restore your backup from {% data variables.product.prodname_enterprise_backup_utilities %}. -1. Confirm that the source instance is offline. -1. Manually configure network settings on the replacement {% data variables.product.prodname_ghe_server %} instance. Network settings are excluded from the backup snapshot, and are not overwritten by `ghe-restore`. For more information, see "[AUTOTITLE](/admin/configuration/configuring-network-settings)." -1. SSH into the destination instance. For more information, see "[AUTOTITLE](/admin/configuration/configuring-your-enterprise/accessing-the-administrative-shell-ssh)." - - ```shell copy - ssh -p 122 admin@HOSTNAME - ``` - -1. Configure the destination instance to use the same external storage service for {% data variables.product.prodname_actions %} as the source instance by entering one of the following commands. - {% data reusables.actions.configure-storage-provider-platform-commands %} -{% data reusables.actions.configure-storage-provider %} -1. To prepare to enable {% data variables.product.prodname_actions %} on the destination instance, enter the following command. - - ```shell copy - ghe-config app.actions.enabled true - ``` - -{% data reusables.actions.apply-configuration-and-enable %} +1. Create a new instance with the "New Install" option. For installation instructions for the virtualization platform of your choice, see "[AUTOTITLE](/admin/installing-your-enterprise-server/setting-up-a-github-enterprise-server-instance)." +1. In the {% data variables.enterprise.management_console %}, configure network settings and external storage for {% data variables.product.prodname_actions %} on the destination instance. See "[AUTOTITLE](/admin/configuring-settings)." 1. After {% data variables.product.prodname_actions %} is configured and enabled, to restore the rest of the data from the backup, use the `ghe-restore` command. For more information, see "[AUTOTITLE](/admin/configuration/configuring-your-enterprise/configuring-backups-on-your-appliance#restoring-a-backup)." 1. Re-register your self-hosted runners on the destination instance. For more information, see "[AUTOTITLE](/actions/hosting-your-own-runners/managing-self-hosted-runners/adding-self-hosted-runners)." 1. {% ifversion ghes < 3.12 %}Optionally, to{% else %}To{% endif %} ensure that the bundled actions that are pre-installed on your new instance are up to date, enter the following command.