diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-30 21:08:47 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-30 21:08:47 +0000 |
| commit | c8f773a8593926f4f2dec6f446a3b3e59e9c9909 (patch) | |
| tree | 4e5ea1d3b861ff99015f6112da567de7873868aa /config | |
| parent | 929b887e5391dea7cb53b88b77b9a35351c87d99 (diff) | |
| download | gitlab-ce-c8f773a8593926f4f2dec6f446a3b3e59e9c9909.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
| -rw-r--r-- | config/gitlab.yml.example | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 62fbc642908..ed5701b6f75 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -959,9 +959,9 @@ production: &base # # Turns on AWS Server-Side Encryption with Amazon S3-Managed Keys for backups, this is optional # # encryption: 'AES256' # # Turns on AWS Server-Side Encryption with Amazon Customer-Provided Encryption Keys for backups, this is optional - # # This should be set to the 256-bit, base64-encoded encryption key for Amazon S3 to use to encrypt or decrypt your data. + # # This should be set to the 256-bit encryption key for Amazon S3 to use to encrypt or decrypt your data. # # 'encryption' must also be set in order for this to have any effect. - # # encryption_key: '<base64 key>' + # # encryption_key: '<key>' # # Specifies Amazon S3 storage class to use for backups, this is optional # # storage_class: 'STANDARD' |