FIX: S3 endpoint broke bucket creation in non-default region

This commit is contained in:
Gerhard Schlager
2019-02-05 17:50:27 +01:00
parent fc999c04b3
commit ba724d7f25
4 changed files with 6 additions and 5 deletions

View File

@@ -193,10 +193,11 @@ class S3Helper
def self.s3_options(obj)
opts = {
region: obj.s3_region,
endpoint: SiteSetting.s3_endpoint,
force_path_style: SiteSetting.s3_force_path_style
}
opts[:endpoint] = SiteSetting.s3_endpoint if SiteSetting.s3_endpoint.present?
unless obj.s3_use_iam_profile
opts[:access_key_id] = obj.s3_access_key_id
opts[:secret_access_key] = obj.s3_secret_access_key