diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-03 23:34:32 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-03 23:34:32 +0300 |
| commit | a47bbf7ce093a46ce83cd66da5d9ce3150324860 (patch) | |
| tree | 36ee17fd93f50c371dba3e8829283fa4bfb98f99 /doc/administration | |
| parent | 4bafeeda963a11ce4004bbe35a4ff2606bc4d10a (diff) | |
Add latest changes from gitlab-org/gitlab@13-5-stable-ee
Diffstat (limited to 'doc/administration')
| -rw-r--r-- | doc/administration/object_storage.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/administration/object_storage.md b/doc/administration/object_storage.md index 8b788e6d91d..0ce1ff447ec 100644 --- a/doc/administration/object_storage.md +++ b/doc/administration/object_storage.md @@ -106,7 +106,7 @@ See the section on [ETag mismatch errors](#etag-mismatch) for more details. # OPTIONAL: The following lines are only needed if server side encryption is required gitlab_rails['object_store']['storage_options'] = { 'server_side_encryption' => '<AES256 or aws:kms>', - 'server_side_encryption_kms_key_id' => '<arn:s3:aws:xxx>' + 'server_side_encryption_kms_key_id' => '<arn:aws:kms:xxx>' } gitlab_rails['object_store']['objects']['artifacts']['bucket'] = '<artifacts>' gitlab_rails['object_store']['objects']['external_diffs']['bucket'] = '<external-diffs>' @@ -145,7 +145,7 @@ See the section on [ETag mismatch errors](#etag-mismatch) for more details. region: <eu-central-1> storage_options: server_side_encryption: <AES256 or aws:kms> - server_side_encryption_key_kms_id: <arn:s3:aws:xxx> + server_side_encryption_key_kms_id: <arn:aws:kms:xxx> objects: artifacts: bucket: <artifacts> |