Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Repo sync #26262

Merged
merged 1 commit into from
Jun 26, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,10 @@ Alternatively, if you want to use the HTTPS protocol for both accounts, you can
```

{% data reusables.git.clear-stored-gcm-credentials %}

```shell copy
echo "protocol=https\nhost=github.com" | git credential-manager erase
```
{% data reusables.git.cache-on-repository-path %}
{% data reusables.accounts.create-personal-access-tokens %}
{% data reusables.git.provide-credentials %}
Expand All @@ -66,6 +70,10 @@ Alternatively, if you want to use the HTTPS protocol for both accounts, you can
{% data reusables.git.clear-the-stored-credentials %}
{% data reusables.git.no-credential-manager %}
{% data reusables.git.clear-stored-gcm-credentials %}

```shell copy
echo "protocol=https`nhost=github.com" | git credential-manager erase
```
- If the output is `wincred`, you're using the Windows Credential Manager. To clear the credentials, enter the following command.

```shell copy
Expand All @@ -85,6 +93,10 @@ Alternatively, if you want to use the HTTPS protocol for both accounts, you can
{% data reusables.git.clear-the-stored-credentials %}
{% data reusables.git.no-credential-manager %}
{% data reusables.git.clear-stored-gcm-credentials %}

```shell copy
echo "protocol=https\nhost=github.com" | git credential-manager erase
```
{% data reusables.git.cache-on-repository-path %}
{% data reusables.accounts.create-personal-access-tokens %}
{% data reusables.git.provide-credentials %}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,8 @@ If your installation is in a Git repository, you can install the latest version

If your backup host has internet connectivity and you previously used a compressed archive (`.tar.gz`) to install or upgrade {% data variables.product.prodname_enterprise_backup_utilities %}, we recommend using a Git repository for your installation instead. Upgrading using Git requires less work and preserves your backup configuration.

To use Git instead of a compressed archive for upgrades, you must back up your existing configuration, clone the repository, copy your configuration into place, verify the installation, verify SSH connectivity, then delete the old installation.

{% data reusables.enterprise_backup_utilities.enterprise-backup-utils-directory %}
1. To back up your existing {% data variables.product.prodname_enterprise_backup_utilities %} configuration, copy your current `backup.config` file to a safe location, such as your home directory.

Expand All @@ -185,7 +187,7 @@ If your backup host has internet connectivity and you previously used a compress
```
cp PATH/TO/BACKUP/FROM/STEP/2 backup.config
```

{% note %}

**Note:** You can choose where to restore your backup configuration file to after cloning. For more information about where configuration files can be located, see [Getting started](https://github.com/github/backup-utils/blob/master/docs/getting-started.md) in the {% data variables.product.prodname_enterprise_backup_utilities %} project documentation.
Expand All @@ -194,6 +196,9 @@ If your backup host has internet connectivity and you previously used a compress

1. To confirm that the paths to directories or scripts in your backup configuration file are correct, review the file in a text editor.
{% data reusables.enterprise_backup_utilities.enterprise-backup-utils-verify-upgrade %}

1. Confirm that your backup data is not in the directory for the old installation.

1. Delete your old GitHub Enterprise Server Backup Utilities directory from step 1 (where the compressed archive installation was located).

## Scheduling a backup
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,7 @@ The benefits of streaming audit data include:

Enterprise owners can set up{% ifversion pause-audit-log-stream %}, pause,{% endif %} or delete a stream at any time. The stream exports the audit and Git events data for all of the organizations in your enterprise.

{% note %}

**Note:** All audit logs are streamed in JSON format.

{% endnote %}
All streamed audit logs are sent as compressed JSON files. The filename format is in`YYYY/MM/HH/MM/<uuid>.json.gz`.

## Setting up audit log streaming

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,12 @@ shortTitle: About licenses

{% data reusables.enterprise.about-deployment-methods %}

{% ifversion ghec %}

{% data reusables.enterprise.invoiced-customer-to-access-ghes %}

{% endif %}

{% data reusables.enterprise-licensing.unique-user-licensing-model %}

To ensure the same user isn't consuming more than one license for multiple enterprise deployments, you can synchronize license usage between your {% data variables.product.prodname_ghe_server %} and {% data variables.product.prodname_ghe_cloud %} deployments.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,12 @@ shortTitle: Download your license

After you purchase or upgrade a license for {% data variables.product.prodname_enterprise %} from {% data variables.contact.contact_enterprise_sales %}, you must download your new license file. For more information about licenses for {% data variables.product.prodname_enterprise %}, see "[AUTOTITLE](/billing/managing-your-license-for-github-enterprise/about-licenses-for-github-enterprise)."

{% ifversion ghec %}

{% data reusables.enterprise.invoiced-customer-to-access-ghes %}

{% endif %}

{% data reusables.enterprise-licensing.contact-sales-for-renewals-or-seats %}

## Downloading your license file
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,14 @@ topics:
- Maintenance
---

{% ifversion ghec %}
{% note %}

**Note:** To create an announcement banner, your organization must use {% data variables.product.prodname_ghe_cloud %}. {% data reusables.enterprise.link-to-ghec-trial %}

{% endnote %}
{% endif %}

You can create an announcement banner that will be displayed to all organization members at the top of every page in the organization.

{% data reusables.enterprise.user-messages-markdown %}
Expand Down
5 changes: 5 additions & 0 deletions data/reusables/enterprise/invoiced-customer-to-access-ghes.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{% note %}

**Note:** Only invoiced customers can access {% data variables.product.prodname_ghe_server %}. To switch to invoicing, contact {% data variables.contact.contact_enterprise_sales %}.

{% endnote %}
4 changes: 0 additions & 4 deletions data/reusables/git/clear-stored-gcm-credentials.md
Original file line number Diff line number Diff line change
@@ -1,5 +1 @@
- If the output is `manager-core`, you're using Git Credential Manager. To clear the credentials, run the following command.

```shell copy
git credential-manager reject https://github.com
```