mirror of
https://github.com/mastodon/mastodon.git
synced 2025-05-27 20:17:09 +00:00
Merge 6f019e013f
into fbe9728f36
This commit is contained in:
commit
cc26e7e594
|
@ -65,10 +65,10 @@ if ENV['S3_ENABLED'] == 'true'
|
||||||
|
|
||||||
s3_options: {
|
s3_options: {
|
||||||
signature_version: ENV.fetch('S3_SIGNATURE_VERSION') { 'v4' },
|
signature_version: ENV.fetch('S3_SIGNATURE_VERSION') { 'v4' },
|
||||||
http_open_timeout: ENV.fetch('S3_OPEN_TIMEOUT') { '5' }.to_i,
|
http_open_timeout: ENV.fetch('S3_OPEN_TIMEOUT') { '15' }.to_i,
|
||||||
http_read_timeout: ENV.fetch('S3_READ_TIMEOUT') { '5' }.to_i,
|
http_read_timeout: ENV.fetch('S3_READ_TIMEOUT') { '15' }.to_i,
|
||||||
http_idle_timeout: 5,
|
http_idle_timeout: 5,
|
||||||
retry_limit: ENV.fetch('S3_RETRY_LIMIT') { '0' }.to_i,
|
retry_limit: ENV.fetch('S3_RETRY_LIMIT') { '1' }.to_i,
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user