mirrors
/
mastodon-glitch
mirror of https://github.com/glitch-soc/mastodon
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix insecure S3 URLs

pull/6/head
Eugen Rochko 2016-11-06 20:59:06 +01:00
parent ea4170785a
commit b835f4aa1c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config/initializers/paperclip.rb
View File

@ -1,5 +1,8 @@
if ENV['S3_ENABLED'] == 'true' if ENV['S3_ENABLED'] == 'true'
Paperclip::Attachment.default_options[:storage] = :s3 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[:path] = '/:class/:attachment/:id_partition/:style/:filename'
Paperclip::Attachment.default_options[:s3_credentials] = { Paperclip::Attachment.default_options[:s3_credentials] = {
bucket: ENV.fetch('S3_BUCKET'), bucket: ENV.fetch('S3_BUCKET'),
@ -7,7 +10,4 @@ if ENV['S3_ENABLED'] == 'true'
secret_access_key: ENV.fetch('AWS_SECRET_ACCESS_KEY'), secret_access_key: ENV.fetch('AWS_SECRET_ACCESS_KEY'),
s3_region: ENV.fetch('S3_REGION') s3_region: ENV.fetch('S3_REGION')
} }
Paperclip::Attachment.default_options[:url] = ':s3_domain_url'
Paperclip::Attachment.default_options[:path] = '/:class/:attachment/:id_partition/:style/:filename'
end end