diff options
| author | Jon Keys <jon.keys@gmail.com> | 2017-03-01 00:30:58 +0300 |
|---|---|---|
| committer | Jon Keys <jon.keys@gmail.com> | 2017-03-01 00:30:58 +0300 |
| commit | 7a7ec1ac0f742753d7acfacb7b7913ebbaf81558 (patch) | |
| tree | 952643b24757862b41b0c2e194140ef4efc6a144 /config | |
| parent | 261f5a68edc37eca25b9f49f2d3d75261bd794a7 (diff) | |
Add storage class configuration option for Amazon S3 remote backups
Diffstat (limited to 'config')
| -rw-r--r-- | config/gitlab.yml.example | 2 | ||||
| -rw-r--r-- | config/initializers/1_settings.rb | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index a82ff605a70..fdd28b13eff 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: diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index c64ae15fa92..f9d3cf17118 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -399,6 +399,7 @@ if Settings.backup['upload']['connection'] end Settings.backup['upload']['multipart_chunk_size'] ||= 104857600 Settings.backup['upload']['encryption'] ||= nil +Settings.backup['upload']['storage_class'] ||= nil # # Git |