github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-02 04:08:41 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: s3 endpoint when using 'us-east-1' region

Browse Source
This commit is contained in:
Régis Hanol
2015-05-27 17:50:49 +02:00
parent 5de9554510
commit 83d2b59fc3
3 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/file_store/s3_store.rb
View File

@ -39,7 +39,12 @@ module FileStore
end
def absolute_base_url
@absolute_base_url ||= "//#{s3_bucket}.s3-#{s3_region}.amazonaws.com"
# cf. http://docs.aws.amazon.com/general/latest/gr/rande.html#s3_region
@absolute_base_url ||= if SiteSetting.s3_region == "us-east-1"
"//#{s3_bucket}.s3.amazonaws.com"
else
"//#{s3_bucket}.s3-#{SiteSetting.s3_region}.amazonaws.com"
end
end
def external?
@ -156,11 +161,6 @@ module FileStore
raise Discourse::SiteSettingMissing.new("s3_upload_bucket") if SiteSetting.s3_upload_bucket.blank?
@s3_bucket = SiteSetting.s3_upload_bucket.downcase
end
def s3_region
SiteSetting.s3_region
end
end
end