diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-24 12:09:24 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-24 12:09:24 +0000 |
| commit | 17c1c66eefd05243dd8ed2c8fd49d17ab1a52522 (patch) | |
| tree | a6f7c103902284c8245bc1991769916139f60aa9 /doc/raketasks/backup_gitlab.md | |
| parent | 3a4363e0098b1ff7689247e55da416848ac51050 (diff) | |
| download | gitlab-ce-17c1c66eefd05243dd8ed2c8fd49d17ab1a52522.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/raketasks/backup_gitlab.md')
| -rw-r--r-- | doc/raketasks/backup_gitlab.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/raketasks/backup_gitlab.md b/doc/raketasks/backup_gitlab.md index ffa67c6b4a9..fd88529807f 100644 --- a/doc/raketasks/backup_gitlab.md +++ b/doc/raketasks/backup_gitlab.md @@ -216,7 +216,7 @@ To ensure the generated archive is transferable by rsync, you can set the `GZIP_ option. This sets the `--rsyncable` option to `gzip`, which is useful only in combination with setting [the Backup filename option](#backup-filename). -Note that the `--rsyncable` option in `gzip` isn't guaranteed to be available +The `--rsyncable` option in `gzip` isn't guaranteed to be available on all distributions. To verify that it's available in your distribution, run `gzip --help` or consult the man pages. @@ -468,7 +468,7 @@ gitlab_rails['backup_upload_storage_options'] = { ##### SSE-KMS -To enable SSE-KMS, you'll need the +To enable SSE-KMS, you need the [KMS key via its Amazon Resource Name (ARN) in the `arn:aws:kms:region:acct-id:key/key-id` format](https://docs.aws.amazon.com/AmazonS3/latest/userguide/UsingKMSEncryption.html). Under the `backup_upload_storage_options` configuration setting, set: |