IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-26 02:40:53 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: S3 image upload

Browse Source
This commit is contained in:
Régis Hanol 2013-03-30 17:56:25 +01:00
parent 853c13f705
commit 0aff5042e5
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/upload.rb
View File

@ -68,7 +68,6 @@ class Upload < ActiveRecord::Base
blob = file.read
sha1 = Digest::SHA1.hexdigest(blob)
Fog.credentials_path = "#{Rails.root}/config/fog_credentials.yml"
fog = Fog::Storage.new(provider: 'AWS')
@ -83,7 +82,8 @@ class Upload < ActiveRecord::Base
public: true,
content_type: file.content_type)
upload.width, upload.height = ImageSizer.resize(*image_info.size)
upload.url = "#{Rails.configuration.action_controller.asset_host}#{path}/#{remote_filename}"
upload.url = "https://#{SiteSetting.s3_upload_bucket}.s3.amazonaws.com#{path}/#{remote_filename}"
upload.save
upload