mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-05 14:36:04 +00:00
Add S3_OVERRIDE_PATH_STYLE
environment variable (#12594)
To support Exoscale
This commit is contained in:
parent
7ee6f51b78
commit
17159625b3
|
@ -52,7 +52,7 @@ if ENV['S3_ENABLED'] == 'true'
|
||||||
if ENV.has_key?('S3_ENDPOINT')
|
if ENV.has_key?('S3_ENDPOINT')
|
||||||
Paperclip::Attachment.default_options[:s3_options].merge!(
|
Paperclip::Attachment.default_options[:s3_options].merge!(
|
||||||
endpoint: ENV['S3_ENDPOINT'],
|
endpoint: ENV['S3_ENDPOINT'],
|
||||||
force_path_style: true
|
force_path_style: ENV['S3_OVERRIDE_PATH_STYLE'] != 'true',
|
||||||
)
|
)
|
||||||
|
|
||||||
Paperclip::Attachment.default_options[:url] = ':s3_path_url'
|
Paperclip::Attachment.default_options[:url] = ':s3_path_url'
|
||||||
|
|
Loading…
Reference in a new issue