Skip to content

Commit 7a8ec59

Browse files
authored
Merge branch 'main' into enc-secrets-steps-update
2 parents 2b81220 + 57c3c94 commit 7a8ec59

File tree

97 files changed

+260
-167
lines changed

Some content is hidden

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

97 files changed

+260
-167
lines changed
56.4 KB
Loading
46.7 KB
Loading
5.54 KB
Loading

content/admin/configuration/configuring-network-settings/configuring-dns-nameservers.md

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,12 @@ The nameservers you specify must resolve {% data variables.product.product_locat
3030

3131
{% data reusables.enterprise_installation.ssh-into-instance %}
3232

33-
2. To edit your nameservers, enter:
33+
2. To edit your nameservers, use the `ghe-setup-network` command in visual mode. For more information, see "[Command-line utilities](/admin/configuration/configuring-your-enterprise/command-line-utilities#ghe-setup-network)."
3434

3535
```shell
36-
sudo vim /etc/resolvconf/resolv.conf.d/head
36+
ghe-setup-network -v
3737
```
3838

39-
{% data reusables.enterprise_installation.preventing-nameservers-change %}
40-
41-
3. Append any `nameserver` entries, then save the file.
42-
4. After verifying your changes, save the file.
4339
5. To add your new nameserver entries to {% data variables.product.product_location %}, run the following:
4440

4541
```shell

content/admin/configuration/configuring-your-enterprise/command-line-utilities.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -343,6 +343,18 @@ With `ghe-set-password`, you can set a new password to authenticate into the [{%
343343
ghe-set-password <new_password>
344344
```
345345

346+
### ghe-setup-network
347+
348+
This utility allows you to configure the primary network interface.
349+
350+
To enter visual mode, which will guide you through configuration of network settings:
351+
352+
```shell
353+
$ ghe-setup-network -v
354+
```
355+
356+
Use the -h flag for additional options.
357+
346358
### ghe-ssh-check-host-keys
347359

348360
This utility checks the existing SSH host keys against the list of known leaked SSH host keys.

content/billing/managing-billing-for-github-codespaces/viewing-your-github-codespaces-usage.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ Organization owners and billing managers can view {% data variables.product.prod
2222
{% data reusables.organizations.billing-settings %}
2323
{% data reusables.dotcom_billing.codespaces-minutes %}
2424
{% data reusables.dotcom_billing.actions-packages-report-download-org-account %}
25+
1. Filter the report to show only rows that mention "Codespaces" in the `Product` field.
26+
27+
![A usage report filtered for Codespaces](/assets/images/help/codespaces/CSV-usage-report.png)
2528

2629
{% ifversion ghec %}
2730
## Viewing {% data variables.product.prodname_codespaces %} usage for your enterprise account

content/code-security/dependabot/working-with-dependabot/automating-dependabot-with-github-actions.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -476,7 +476,8 @@ on: pull_request_target
476476
477477
permissions:
478478
contents: write
479-
479+
pull-requests: write
480+
480481
jobs:
481482
dependabot:
482483
runs-on: ubuntu-latest
@@ -507,6 +508,7 @@ on: pull_request
507508
508509
permissions:
509510
contents: write
511+
pull-requests: write
510512
511513
jobs:
512514
dependabot:

content/codespaces/managing-your-codespaces/managing-encrypted-secrets-for-your-codespaces.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,22 @@ You can update the value of an existing secret, and you can change which reposit
8282
1. Read the warning, then click **OK**.
8383
![Confirmation to delete secret](/assets/images/help/settings/codespaces-secret-delete-warning.png)
8484

85+
## Using secrets
86+
87+
A secret is exported as an environment variable into the user's terminal session.
88+
89+
![Displaying the value of an exported secret in the terminal](/assets/images/help/codespaces/exported-codespace-secret.png)
90+
91+
You can use secrets in a codespace after the codespace is built and is running. For example, a secret can be used:
92+
93+
* When launching an application from the integrated terminal or ssh session.
94+
* Within a dev container lifecycle script that is run after the codespace is running. For more information about dev container lifecycle scripts, see the documentation on containers.dev: [Specification](https://containers.dev/implementors/json_reference/#lifecycle-scripts).
95+
96+
Codespace secrets cannot be used during:
97+
98+
* Codespace build time (that is, within a Dockerfile or custom entry point).
99+
* Within a dev container feature. For more information, see the `features` attribute in the documentation on containers.dev: [Specification](https://containers.dev/implementors/json_reference/#general-properties).
100+
85101
## Further reading
86102

87103
- "[Managing encrypted secrets for your repository and organization for {% data variables.product.prodname_github_codespaces %}](/codespaces/managing-codespaces-for-your-organization/managing-encrypted-secrets-for-your-repository-and-organization-for-github-codespaces)"

content/developers/apps/building-oauth-apps/scopes-for-oauth-apps.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ Name | Description
4242
-----|-----------|{% ifversion not ghae %}
4343
**`(no scope)`** | Grants read-only access to public information (including user profile info, repository info, and gists){% endif %}{% ifversion ghes or ghae %}
4444
**`site_admin`** | Grants site administrators access to [{% data variables.product.prodname_ghe_server %} Administration API endpoints](/rest/reference/enterprise-admin).{% endif %}
45-
**`repo`** | Grants full access to repositories, including private repositories. That includes read/write access to code, commit statuses, repository and organization projects, invitations, collaborators, adding team memberships, deployment statuses, and repository webhooks for repositories and organizations. Also grants ability to manage user projects.
45+
**`repo`** | Grants full access to public{% ifversion ghec or ghes or ghae %}, internal,{% endif %} and private repositories including read and write access to code, commit statuses, repository invitations, collaborators, deployment statuses, and repository webhooks. **Note**: In addition to repository related resources, the `repo` scope also grants access to manage organization-owned resources including projects, invitations, team memberships and webhooks. This scope also grants the ability to manage projects owned by users.
4646
&emsp;`repo:status`| Grants read/write access to commit statuses in {% ifversion fpt %}public and private{% elsif ghec or ghes %}public, private, and internal{% elsif ghae %}private and internal{% endif %} repositories. This scope is only necessary to grant other users or services access to private repository commit statuses *without* granting access to the code.
4747
&emsp;`repo_deployment`| Grants access to [deployment statuses](/rest/reference/repos#deployments) for {% ifversion not ghae %}public{% else %}internal{% endif %} and private repositories. This scope is only necessary to grant other users or services access to deployment statuses, *without* granting access to the code.{% ifversion not ghae %}
4848
&emsp;`public_repo`| Limits access to public repositories. That includes read/write access to code, commit statuses, repository projects, collaborators, and deployment statuses for public repositories and organizations. Also required for starring public repositories.{% endif %}

content/get-started/writing-on-github/working-with-advanced-formatting/attaching-files.md

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,7 @@ topics:
1616
- Pull requests
1717
---
1818

19-
{% warning %}
20-
21-
**Warning:** If you attach a file to a pull request or issue comment, anyone can view the anonymized URL without authentication, even if the pull request is in a private repository{% ifversion ghes %}, or if private mode is enabled{% endif %}. To keep sensitive media files private, serve them from a private network or server that requires authentication. {% ifversion fpt or ghec %}For more information on anonymized URLs see "[About anonymized URLs](/github/authenticating-to-github/about-anonymized-urls)".{% endif %}
22-
23-
{% endwarning %}
19+
{% data reusables.repositories.anyone-can-view-anonymized-url %}
2420

2521
To attach a file to an issue or pull request conversation, drag and drop it into the comment box. Alternatively, you can click the bar at the bottom of the comment box to browse, select, and add a file from your computer.
2622

0 commit comments

Comments
 (0)