diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-03-06 17:42:30 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-03-06 17:42:30 +0000 |
| commit | 8526c9f3c4fc29f544593bcc361409eaf80caafe (patch) | |
| tree | 68936213d8a8f4cb6af05348e9fb305757c2010c /config/gitlab.yml.example | |
| parent | 1ad1cdba9693cbdbe96ea3d83789f06b9898c6d3 (diff) | |
| parent | 7a7ec1ac0f742753d7acfacb7b7913ebbaf81558 (diff) | |
| download | gitlab-ce-8526c9f3c4fc29f544593bcc361409eaf80caafe.tar.gz | |
Merge branch 'backup_storage_class' into 'master'
Add storage class configuration option for Amazon S3 remote backups
See merge request !9599
Diffstat (limited to 'config/gitlab.yml.example')
| -rw-r--r-- | config/gitlab.yml.example | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 8f99a4d541f..c9bd6b930d6 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -483,6 +483,8 @@ production: &base # multipart_chunk_size: 104857600 # # Turns on AWS Server-Side Encryption with Amazon S3-Managed Keys for backups, this is optional # # encryption: 'AES256' + # # Specifies Amazon S3 storage class to use for backups, this is optional + # # storage_class: 'STANDARD' ## GitLab Shell settings gitlab_shell: |