diff options
author | Jeroen Nijhof <jeroen@jeroennijhof.nl> | 2015-06-09 17:35:31 +0200 |
---|---|---|
committer | Jeroen Nijhof <jeroen@jeroennijhof.nl> | 2015-06-09 17:35:31 +0200 |
commit | 151dd7ccad23e9866dca7045405f422bdd2e77a5 (patch) | |
tree | 7144b6361191934023a835717850741c8506f03b /config | |
parent | 72371097641202e6e11acc0fe61535fe7bbb2732 (diff) | |
download | gitlab-ci-151dd7ccad23e9866dca7045405f422bdd2e77a5.tar.gz |
make multipart_chunk_size configurable
Diffstat (limited to 'config')
-rw-r--r-- | config/application.yml.example | 3 | ||||
-rw-r--r-- | config/initializers/1_settings.rb | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/config/application.yml.example b/config/application.yml.example index 8f64c33..760cab4 100644 --- a/config/application.yml.example +++ b/config/application.yml.example @@ -44,6 +44,9 @@ defaults: &defaults # 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 development: diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index 6021b46..dbe4fa1 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -63,3 +63,4 @@ 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 |