Add AWS_BACKUP_STORAGE_CLASS configuration option

Author: drubin

README.md

@@ -1027,7 +1027,8 @@ Below is the complete list of available options that can be used to customize yo
 | `AWS_BACKUP_SECRET_ACCESS_KEY` | AWS secret access key. No defaults. |
 | `AWS_BACKUP_BUCKET` | AWS bucket for backup uploads. No defaults. |
 | `AWS_BACKUP_MULTIPART_CHUNK_SIZE` | Enables mulitpart uploads when file size reaches a defined size. See at [AWS S3 Docs](http://docs.aws.amazon.com/AmazonS3/latest/dev/uploadobjusingmpu.html) |
-| `AWS_BACKUP_ENCRYPTION`     | Turns on AWS Server-Side Encryption.  Defaults to `false`. See at [AWS s3 Docs](http://docs.aws.amazon.com/AmazonS3/latest/dev/UsingServerSideEncryption.html) |
+| `AWS_BACKUP_ENCRYPTION`     | Turns on AWS Server-Side Encryption.  Defaults to `false`. See at [AWS S3 Docs](http://docs.aws.amazon.com/AmazonS3/latest/dev/UsingServerSideEncryption.html) |
+| `AWS_BACKUP_STORAGE_CLASS` | Configure the storage class for the item. Defaults to `STANDARD`  See at [AWS S3 Docs](http://docs.aws.amazon.com/AmazonS3/latest/dev/storage-class-intro.html) |
 | `GCS_BACKUPS` | Enables automatic uploads to an Google Cloud Storage (GCS) instance. Defaults to `false`.  |
 | `GCS_BACKUP_ACCESS_KEY_ID` | GCS access key id. No defaults |
 | `GCS_BACKUP_SECRET_ACCESS_KEY` | GCS secret access key. No defaults |

assets/runtime/config/gitlabhq/gitlab.yml

@@ -521,6 +521,8 @@ production: &base
       # Turns on AWS Server-Side Encryption with Amazon S3-Managed Keys for backups, this is optional
       encryption: 'AES256'
       #end-encryption-aws
+      # Specifies Amazon S3 storage class to use for backups, this is optional
+      storage_class: '{{AWS_BACKUP_STORAGE_CLASS}}'
       # Fog storage connection settings, see http://fog.io/storage/ .
       #end-aws
       #start-gcs

assets/runtime/env-defaults

@@ -159,6 +159,7 @@ AWS_BACKUP_SECRET_ACCESS_KEY=${AWS_BACKUP_SECRET_ACCESS_KEY}
 AWS_BACKUP_BUCKET=${AWS_BACKUP_BUCKET}
 AWS_BACKUP_MULTIPART_CHUNK_SIZE=${AWS_BACKUP_MULTIPART_CHUNK_SIZE}
 AWS_BACKUP_ENCRYPTION=${AWS_BACKUP_ENCRYPTION}
+AWS_BACKUP_STORAGE_CLASS=${AWS_BACKUP_STORAGE_CLASS:-STANDARD}
 
 ### GCS BACKUPS
 GCS_BACKUPS=${GCS_BACKUPS:-false}

assets/runtime/functions

@@ -819,7 +819,8 @@ gitlab_configure_backups_aws() {
       AWS_BACKUP_ACCESS_KEY_ID \
       AWS_BACKUP_SECRET_ACCESS_KEY \
       AWS_BACKUP_BUCKET \
-      AWS_BACKUP_MULTIPART_CHUNK_SIZE
+      AWS_BACKUP_MULTIPART_CHUNK_SIZE \
+      AWS_BACKUP_STORAGE_CLASS
 }
 
 gitlab_configure_backup_gcs() {