mirror of
https://github.com/mastodon/mastodon.git
synced 2024-12-22 09:08:24 +00:00
Fix region setting for AWS gem
This commit is contained in:
parent
2d69bf4b3a
commit
2f21f4cc01
|
@ -175,7 +175,8 @@ class ProcessFeedService < BaseService
|
|||
|
||||
def url(xml = @xml)
|
||||
link = xml.at_xpath('./xmlns:link[@rel="alternate"]')
|
||||
link['href']
|
||||
link['href'] unless link.nil?
|
||||
nil
|
||||
end
|
||||
|
||||
def content(xml = @xml)
|
||||
|
|
|
@ -2,6 +2,7 @@ if ENV['S3_ENABLED'] == 'true'
|
|||
Paperclip::Attachment.default_options[:storage] = :s3
|
||||
Paperclip::Attachment.default_options[:s3_protocol] = 'https'
|
||||
Paperclip::Attachment.default_options[:url] = ':s3_domain_url'
|
||||
Paperclip::Attachment.default_options[:s3_host_name] = "s3-#{ENV.fetch('S3_REGION')}.amazonaws.com"
|
||||
Paperclip::Attachment.default_options[:path] = '/:class/:attachment/:id_partition/:style/:filename'
|
||||
|
||||
Paperclip::Attachment.default_options[:s3_credentials] = {
|
||||
|
|
Loading…
Reference in a new issue