github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-25 09:42:07 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

DB based S3 settings fixes for s3:upload_assets.

Browse Source
This commit is contained in:
Guo Xiang Tan 2018-11-15 15:48:40 +08:00
parent 901611cb4e
commit a895626d10
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/tasks/s3.rake
View File

@ -43,11 +43,20 @@ end
def helper
@helper ||= begin
setting = use_db_s3_config ? SiteSetting : GlobalSetting
bucket, options =
if use_db_s3_config
[
SiteSetting.s3_upload_bucket.downcase,
S3Helper.s3_options(SiteSetting)
]
else
[
GlobalSetting.s3_bucket.downcase,
S3Helper.s3_options(GlobalSetting)
]
end
S3Helper.new(
setting.s3_bucket.downcase, '', S3Helper.s3_options(setting)
)
S3Helper.new(bucket, '', options)
end
end