From 7a7ec1ac0f742753d7acfacb7b7913ebbaf81558 Mon Sep 17 00:00:00 2001 From: Jon Keys Date: Tue, 28 Feb 2017 16:30:58 -0500 Subject: Add storage class configuration option for Amazon S3 remote backups --- config/gitlab.yml.example | 2 ++ config/initializers/1_settings.rb | 1 + 2 files changed, 3 insertions(+) (limited to 'config') 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 -- cgit v1.2.3