Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
6d74a107
Commit
6d74a107
authored
Oct 26, 2020
by
Mike Lockhart
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix incorrect S3 KMS key id ARN in object storage
parent
894d255e
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
doc/administration/object_storage.md
doc/administration/object_storage.md
+2
-2
No files found.
doc/administration/object_storage.md
View file @
6d74a107
...
...
@@ -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:aw
s:xxx>'
'server_side_encryption_kms_key_id' => '<arn:
aws:km
s: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:aw
s:xxx>
server_side_encryption_key_kms_id
:
<arn:
aws:km
s:xxx>
objects
:
artifacts
:
bucket
:
<artifacts>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment