zelo72
/
mastodon
mirror of https://github.com/mastodon/mastodon
2
2
Fork 1
Code Issues 10 Releases Wiki Activity

Add `S3_OVERRIDE_PATH_STYLE` environment variable (#12594) 

To support Exoscale
This commit is contained in:
Eugen Rochko 2019-12-10 07:40:01 +01:00 committed by GitHub
parent 7ee6f51b78
commit 17159625b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/initializers/paperclip.rb
View File

@ -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'