diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-05 09:10:01 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-05 09:10:01 +0000 |
| commit | 88ad172d0417292fc1bf70a0dfb3877a0ecb7c79 (patch) | |
| tree | e776a9c0a62297c292131e2009e3fc8734ed44d5 /config/gitlab.yml.example | |
| parent | bd4eece38d24e421c8745c365f94be756589e892 (diff) | |
| download | gitlab-ce-88ad172d0417292fc1bf70a0dfb3877a0ecb7c79.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config/gitlab.yml.example')
| -rw-r--r-- | config/gitlab.yml.example | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 7ba256b39cd..e16a254e256 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -218,6 +218,9 @@ production: &base # region: us-east-1 # aws_signature_version: 4 # For creation of signed URLs. Set to 2 if provider does not support v4. # endpoint: 'https://s3.amazonaws.com' # default: nil - Useful for S3 compliant services such as DigitalOcean Spaces + # storage_options: + # server_side_encryption: AES256 # AES256, aws:kms + # server_side_encryption_kms_key_id: # Amazon Resource Name. See https://docs.aws.amazon.com/AmazonS3/latest/dev/UsingKMSEncryption.html # objects: # artifacts: # bucket: artifacts |