Skip to content

Commit bacf739

Browse files
authored
Merge pull request #35962 from github/repo-sync
Repo sync
2 parents 9a1c3b0 + eddcfd7 commit bacf739

File tree

69 files changed

+159
-271
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+159
-271
lines changed

content/actions/managing-workflow-runs-and-deployments/managing-workflow-runs/re-running-workflows-and-jobs.md

+1-8
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ versions:
1616

1717
## About re-running workflows and jobs
1818

19-
Re-running a workflow{% ifversion re-run-jobs %} or jobs in a workflow{% endif %} uses the same `GITHUB_SHA` (commit SHA) and `GITHUB_REF` (Git ref) of the original event that triggered the workflow run. The workflow will use the privileges of the actor who initially triggered the workflow, not the privileges of the actor who initiated the re-run. You can re-run a workflow{% ifversion re-run-jobs %} or jobs in a workflow{% endif %} for up to 30 days after the initial run.{% ifversion re-run-jobs %} You cannot re-run jobs in a workflow once its logs have passed their retention limits. For more information, see [AUTOTITLE](/actions/learn-github-actions/usage-limits-billing-and-administration#artifact-and-log-retention-policy).{% endif %}{% ifversion debug-reruns %} When you re-run a workflow or jobs in a workflow, you can enable debug logging for the re-run. This will enable runner diagnostic logging and step debug logging for the re-run. For more information about debug logging, see [AUTOTITLE](/actions/monitoring-and-troubleshooting-workflows/enabling-debug-logging).{% endif %}
19+
Re-running a workflow{% ifversion re-run-jobs %} or jobs in a workflow{% endif %} uses the same `GITHUB_SHA` (commit SHA) and `GITHUB_REF` (Git ref) of the original event that triggered the workflow run. The workflow will use the privileges of the actor who initially triggered the workflow, not the privileges of the actor who initiated the re-run. You can re-run a workflow{% ifversion re-run-jobs %} or jobs in a workflow{% endif %} for up to 30 days after the initial run.{% ifversion re-run-jobs %} You cannot re-run jobs in a workflow once its logs have passed their retention limits. For more information, see [AUTOTITLE](/actions/learn-github-actions/usage-limits-billing-and-administration#artifact-and-log-retention-policy).{% endif %} When you re-run a workflow or jobs in a workflow, you can enable debug logging for the re-run. This will enable runner diagnostic logging and step debug logging for the re-run. For more information about debug logging, see [AUTOTITLE](/actions/monitoring-and-troubleshooting-workflows/enabling-debug-logging).
2020

2121
## Re-running all the jobs in a workflow
2222

@@ -46,15 +46,12 @@ To re-run a failed workflow run, use the `run rerun` subcommand. Replace `run-id
4646
gh run rerun RUN_ID
4747
```
4848

49-
{% ifversion debug-reruns %}
5049
{% data reusables.actions.enable-debug-logging-cli %}
5150

5251
```shell
5352
gh run rerun RUN_ID --debug
5453
```
5554

56-
{% endif %}
57-
5855
To view the progress of the workflow run, use the `run watch` subcommand and select the run from the interactive list.
5956

6057
```shell
@@ -88,14 +85,12 @@ To re-run failed jobs in a workflow run, use the `run rerun` subcommand with the
8885
gh run rerun RUN_ID --failed
8986
```
9087

91-
{% ifversion debug-reruns %}
9288
{% data reusables.actions.enable-debug-logging-cli %}
9389

9490
```shell
9591
gh run rerun RUN_ID --failed --debug
9692
```
9793

98-
{% endif %}
9994
{% endcli %}
10095

10196
## Re-running a specific job in a workflow
@@ -122,14 +117,12 @@ To re-run a specific job in a workflow run, use the `run rerun` subcommand with
122117
gh run rerun --job JOB_ID
123118
```
124119

125-
{% ifversion debug-reruns %}
126120
{% data reusables.actions.enable-debug-logging-cli %}
127121

128122
```shell
129123
gh run rerun --job JOB_ID --debug
130124
```
131125

132-
{% endif %}
133126
{% endcli %}
134127

135128
{% endif %}

content/actions/monitoring-and-troubleshooting-workflows/troubleshooting-workflows/enabling-debug-logging.md

-4
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,8 @@ These extra logs are enabled by setting secrets or variables in the repository c
2121

2222
For more information on setting secrets and variables, see [AUTOTITLE](/actions/security-guides/using-secrets-in-github-actions) and [AUTOTITLE](/actions/learn-github-actions/variables).
2323

24-
{% ifversion debug-reruns %}
25-
2624
Additionally, anyone who has access to run a workflow can enable runner diagnostic logging and step debug logging for a workflow re-run. For more information, see [AUTOTITLE](/actions/managing-workflow-runs/re-running-workflows-and-jobs).
2725

28-
{% endif %}
29-
3026
## Enabling runner diagnostic logging
3127

3228
Runner diagnostic logging provides additional log files that contain information about how a runner is executing a job. Two extra log files are added to the log archive:

content/admin/administering-your-instance/administering-your-instance-from-the-command-line/command-line-utilities.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ ghe-org-admin-promote -a
282282

283283
### ghe-reactivate-admin-login
284284

285-
Use this command to immediately unlock the {% data variables.enterprise.management_console %} after {% ifversion enterprise-authentication-rate-limits %}an account lockout. To configure authentication policies for {% data variables.location.product_location %}, see [AUTOTITLE](/admin/configuration/configuring-your-enterprise/configuring-rate-limits#configuring-authentication-policy-rate-limits).{% else %}10 failed login attempts in the span of 10 minutes.{% endif %}
285+
Use this command to immediately unlock the {% data variables.enterprise.management_console %} after an account lockout. To configure authentication policies for {% data variables.location.product_location %}, see [AUTOTITLE](/admin/configuration/configuring-your-enterprise/configuring-rate-limits#configuring-authentication-policy-rate-limits).
286286

287287
```shell
288288
ghe-reactivate-admin-login
@@ -376,7 +376,7 @@ inactive
376376

377377
### ghe-set-password
378378

379-
This utility allows you to set a new {% ifversion enterprise-management-console-multi-user-auth %}root site administrator {% endif %}password for authentication to the {% data variables.enterprise.management_console %}. For more information, see [AUTOTITLE](/admin/administering-your-instance/administering-your-instance-from-the-web-ui/managing-access-to-the-management-console).
379+
This utility allows you to set a new root site administrator password for authentication to the {% data variables.enterprise.management_console %}. For more information, see [AUTOTITLE](/admin/administering-your-instance/administering-your-instance-from-the-web-ui/managing-access-to-the-management-console).
380380

381381
```shell
382382
ghe-set-password

content/admin/administering-your-instance/administering-your-instance-from-the-web-ui/about-the-management-console.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ The {% data variables.enterprise.management_console %} allows you to manage the
2020

2121
You can always reach the {% data variables.enterprise.management_console %} using {% data variables.location.product_location %}'s IP address, even when the instance is in maintenance mode, or there is a critical application failure or hostname or SSL misconfiguration.
2222

23-
To access the {% data variables.enterprise.management_console %}, {% ifversion enterprise-management-console-multi-user-auth %}you can use the root site administrator password established during initial setup of {% data variables.location.product_location %} or log in as a {% data variables.enterprise.management_console %} user. For more information, see [AUTOTITLE](/admin/configuration/administering-your-instance-from-the-management-console/accessing-the-management-console). {% else %}you must use the administrator password established during initial setup of {% data variables.location.product_location %}. {% endif %}You must also be able to connect to the virtual machine host on port 8443. If you're having trouble reaching the {% data variables.enterprise.management_console %}, please check intermediate firewall and security group configurations.
23+
To access the {% data variables.enterprise.management_console %}, you can use the root site administrator password established during initial setup of {% data variables.location.product_location %} or log in as a {% data variables.enterprise.management_console %} user. For more information, see [AUTOTITLE](/admin/configuration/administering-your-instance-from-the-management-console/accessing-the-management-console). You must also be able to connect to the virtual machine host on port 8443. If you're having trouble reaching the {% data variables.enterprise.management_console %}, please check intermediate firewall and security group configurations.
2424

2525
The {% data variables.enterprise.management_console %} password hash is stored in `/data/user/common/secrets.conf`. If high availability or clustering is configured, the file is automatically synced from the primary node to any additional nodes. Any change to the primary's password will automatically be replicated to all of the instance's nodes. For more information about high availability, see [AUTOTITLE](/admin/enterprise-management/configuring-high-availability/about-high-availability-configuration).
2626

@@ -35,10 +35,10 @@ When someone performs an action in the {% data variables.enterprise.management_c
3535
In the {% data variables.enterprise.management_console %}, you can perform administrative tasks for {% data variables.location.product_location %}, including:
3636

3737
* **Initial setup:** Walk through the initial setup process when first launching {% data variables.location.product_location %} by visiting {% data variables.location.product_location %}'s IP address in your browser.
38-
{%- ifversion enterprise-management-console-multi-user-auth %}
38+
3939
* **Identity and access management:** Improve the security of {% data variables.location.product_location %} by creating dedicated user accounts for the {% data variables.enterprise.management_console %}. {% ifversion management-console-editor %}The root site administrator account can control these user accounts' access by assigning either the editor or operator role. {% endif %}For more information, see [AUTOTITLE](/admin/configuration/administering-your-instance-from-the-management-console/managing-access-to-the-management-console).{% ifversion management-console-editor %}
4040
{% data reusables.enterprise.editor-role-note %}{% endif %}
41-
{%- endif %}
41+
4242
* **Configuring authentication policies for the {% data variables.enterprise.management_console %}:** Set rate limits for login attempts, and the lockout duration if someone exceeds the rate limit. For more information, see [AUTOTITLE](/admin/configuration/administering-your-instance-from-the-management-console/managing-access-to-the-management-console#configuring-rate-limits-for-authentication-to-the-management-console).
4343
* **Configuring basic settings for your instance:** Configure DNS, hostname, SSL, user authentication, email, monitoring services, and log forwarding on the Settings page.
4444
* **Scheduling maintenance windows:** Take {% data variables.location.product_location %} offline while performing maintenance using the {% data variables.enterprise.management_console %} or administrative shell.

content/admin/administering-your-instance/administering-your-instance-from-the-web-ui/managing-access-to-the-management-console.md

+1-9
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Managing access to the Management Console
33
shortTitle: Manage Management Console access
4-
intro: '{% ifversion enterprise-management-console-multi-user-auth %}You can increase the security of {% data variables.location.product_location %} by creating or deleting {% data variables.enterprise.management_console %} users. As the root site administrator, you {% else %}You {% endif %}can access the {% data variables.enterprise.management_console %} as well as configure {% data variables.enterprise.management_console %} authentication rate limits.'
4+
intro: 'You can increase the security of {% data variables.location.product_location %} by creating or deleting {% data variables.enterprise.management_console %} users. As the root site administrator, you can access the {% data variables.enterprise.management_console %} as well as configure {% data variables.enterprise.management_console %} authentication rate limits.'
55
redirect_from:
66
- /admin/configuration/administering-your-instance-from-the-management-console/managing-access-to-the-management-console
77
versions:
@@ -18,8 +18,6 @@ topics:
1818

1919
{% ifversion ghes-manage-api-cli-extension %}You can also use the `gh es` {% data variables.product.prodname_cli %} extension to manage the root site administrator password, which controls access to the Management Console. For more information, see the [GH ES CLI usage documentation](https://github.com/github/gh-es/blob/main/USAGE.md#gh-es-access-set-password) and [AUTOTITLE](/admin/administering-your-instance/administering-your-instance-from-the-command-line/administering-your-instance-using-the-github-cli).{% endif %}
2020

21-
{% ifversion enterprise-management-console-multi-user-auth %}
22-
2321
## Types of {% data variables.enterprise.management_console %} accounts
2422

2523
There are two types of user accounts for the {% data variables.enterprise.management_console %} on a {% data variables.product.product_name %} instance. The root site administrator account authenticates with a password established during the initial setup of {% data variables.location.product_location %}.
@@ -72,10 +70,6 @@ If you have not configured email notifications for {% data variables.location.pr
7270
1. To copy the invitation link, click {% octicon "link" aria-label="Copy invitation link" %} on any {% data variables.enterprise.management_console %} user account.
7371
1. Send the invitation link to the {% data variables.enterprise.management_console %} user. The invitation link will lead the user through the final account setup steps.
7472

75-
{% endif %}
76-
77-
{% ifversion enterprise-authentication-rate-limits %}
78-
7973
## Configuring rate limits for authentication to the {% data variables.enterprise.management_console %}
8074

8175
You can configure the lockout time and login attempt limits for the {% data variables.enterprise.management_console %}.
@@ -87,5 +81,3 @@ After you configure rate limits and a {% data variables.enterprise.management_co
8781
1. Optionally, under "Lockout time for Management Console users", type a number of minutes to lock the {% data variables.enterprise.management_console %} after too many failed login attempts. When locked out, the root site administrator must be manually unlocked.
8882
1. Optionally, under "Login attempt limit for all users", type a maximum number of failed login attempts to allow before the {% data variables.enterprise.management_console %} is locked.
8983
{% data reusables.enterprise_management_console.save-settings %}
90-
91-
{% endif %}

content/admin/administering-your-instance/administering-your-instance-from-the-web-ui/troubleshooting-access-to-the-management-console.md

+1-9
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,12 @@ If you experience problems accessing the Management Console, you can try the fol
2020

2121
## Unlocking the {% data variables.enterprise.management_console %} after failed login attempts
2222

23-
The {% data variables.enterprise.management_console %} locks after {% ifversion enterprise-authentication-rate-limits %}the number of failed login attempts configured by your authentication policies. For more information, see [AUTOTITLE](/admin/configuration/administering-your-instance-from-the-management-console/managing-access-to-the-management-console#configuring-rate-limits-for-authentication-to-the-management-console).{% else %}ten failed login attempts are made in the span of ten minutes. You must wait for the login screen to automatically unlock before attempting to log in again. The login screen automatically unlocks as soon as the previous ten minute period contains fewer than ten failed login attempts. The counter resets after a successful login occurs.{% endif %}
24-
25-
{% ifversion enterprise-management-console-multi-user-auth %}
23+
The {% data variables.enterprise.management_console %} locks after the number of failed login attempts configured by your authentication policies. For more information, see [AUTOTITLE](/admin/configuration/administering-your-instance-from-the-management-console/managing-access-to-the-management-console#configuring-rate-limits-for-authentication-to-the-management-console).
2624

2725
### Unlocking the root site administrator account
2826

29-
{% endif %}
30-
3127
{% data reusables.enterprise_management_console.unlocking-management-console-with-shell %}
3228

33-
{% ifversion enterprise-management-console-multi-user-auth %}
34-
3529
### Unlocking a {% data variables.enterprise.management_console %} user account
3630

3731
The root site administrator can unlock access to the {% data variables.enterprise.management_console %} for other user accounts.
@@ -40,8 +34,6 @@ The root site administrator can unlock access to the {% data variables.enterpris
4034
{% data reusables.enterprise_site_admin_settings.click-user-management %}
4135
1. Locked user accounts will appear as "State: blocked". To unblock the user and allow authentication, to the right of the user's details, click {% octicon "law" aria-label="Unblock user" %}.
4236

43-
{%- endif %}
44-
4537
## Troubleshooting failed connections to the {% data variables.enterprise.management_console %}
4638

4739
If you cannot connect to the {% data variables.enterprise.management_console %} on {% data variables.location.product_location %}, you can review the following information to troubleshoot the problem.

content/admin/configuring-packages/migrating-your-enterprise-to-the-container-registry-from-the-docker-registry.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ intro: 'You can migrate Docker images previously stored in the Docker registry o
44
product: '{% data reusables.gated-features.packages %}'
55
permissions: 'Enterprise owners can migrate Docker images to the {% data variables.product.prodname_container_registry %}.'
66
versions:
7-
feature: docker-ghcr-enterprise-migration
7+
ghes: '*'
88
shortTitle: Migrate to Container registry
99
topics:
1010
- Containers

content/admin/installing-your-enterprise-server/setting-up-a-github-enterprise-server-instance/installing-github-enterprise-server-on-azure.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ Before launching {% data variables.location.product_location %} on Azure, you'll
7777
7878
## Configuring the {% data variables.product.prodname_ghe_server %} virtual machine
7979

80-
To configure the instance, you must confirm the instance's status, upload a license file, set the {% ifversion enterprise-management-console-multi-user-auth %}root {% endif %} {% data variables.enterprise.management_console %} password, configure the instance's settings, and restart the instance.
80+
To configure the instance, you must confirm the instance's status, upload a license file, set the root {% data variables.enterprise.management_console %} password, configure the instance's settings, and restart the instance.
8181

8282
{% data reusables.enterprise_installation.new-instance-attack-vector-warning %}
8383

content/admin/managing-accounts-and-repositories/communicating-information-to-users-in-your-enterprise/customizing-user-messages-for-your-enterprise.md

-9
Original file line numberDiff line numberDiff line change
@@ -84,21 +84,12 @@ If you include Markdown checkboxes in the message, all checkboxes must be select
8484

8585
Each time a user sees a mandatory message, an audit log event is created. The event includes the version of the message that the user saw. For more information see [AUTOTITLE](/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/audit-log-events-for-your-enterprise).
8686

87-
{% ifversion display-mandatory-message-again %} {% else %}
88-
89-
> [!NOTE]
90-
> If you change the mandatory message for {% data variables.location.product_location %}, users who have already acknowledged the message will not see the new message.
91-
92-
{% endif %}
93-
9487
{% data reusables.enterprise-accounts.access-enterprise %}
9588
{% data reusables.enterprise-accounts.settings-tab %}
9689
{% data reusables.enterprise-accounts.messages-tab %}
9790
1. To the right of "Mandatory message", click **Add mandatory message**.
9891
1. Under "Mandatory message", in the text box, type your message.
99-
{%- ifversion display-mandatory-message-again %}
10092
1. Optionally, select **Show updated message to all users even if they dismissed the previous one**.
101-
{% endif %}
10293
{% data reusables.enterprise_site_admin_settings.message-preview-save %}
10394

10495
{% endif %}

0 commit comments

Comments
 (0)