diff options
| author | Jeroen Nijhof <jeroen@jeroennijhof.nl> | 2015-06-09 18:56:37 +0300 |
|---|---|---|
| committer | Jeroen Nijhof <jeroen@jeroennijhof.nl> | 2015-06-09 18:56:37 +0300 |
| commit | bf7315cb13eab0cd1427efe29ce110a963b63c34 (patch) | |
| tree | ca4a531e408815d107587d66a32d6d87c96ece54 /config | |
| parent | 6267a6b9995744fc5ccab7a89c27a27e61b9cb7b (diff) | |
update fog to 1.25.0 and add multipart upload support
Diffstat (limited to 'config')
| -rw-r--r-- | config/gitlab.yml.example | 4 | ||||
| -rw-r--r-- | config/initializers/1_settings.rb | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 787b3ccfc56..220a898cd61 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -252,6 +252,10 @@ production: &base # aws_secret_access_key: 'secret123' # # The remote 'directory' to store your backups. For S3, this would be the bucket name. # remote_directory: 'my.s3.bucket' + # # Use multipart uploads when file size reaches 100MB, see + # # http://docs.aws.amazon.com/AmazonS3/latest/dev/uploadobjusingmpu.html + # multipart_chunk_size: 104857600 + ## GitLab Shell settings gitlab_shell: diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index 1bd14a3a89f..c2c3c5bfde7 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -174,6 +174,7 @@ Settings.backup['upload'] ||= Settingslogic.new({ 'remote_directory' => nil, 'co if Settings.backup['upload']['connection'] Settings.backup['upload']['connection'] = Hash[Settings.backup['upload']['connection'].map { |k, v| [k.to_sym, v] }] end +Settings.backup['upload']['multipart_chunk_size'] ||= 104857600 # # Git |