From 489602efe5e099f57bb2b58b7c67f8fc104ff5db Mon Sep 17 00:00:00 2001 From: Harshavardhana Date: Mon, 31 Jul 2017 09:22:52 -0700 Subject: Allow regions to be set and honored for S3 driver. (#7010) This is necessary for certain users where GetBucketLocation API is disabled using IAM policies. There is a field AmazonS3Region which we need to re-purpose and use to support this properly. Fixes https://github.com/mattermost/platform/issues/6999 --- model/config.go | 5 ----- 1 file changed, 5 deletions(-) (limited to 'model') diff --git a/model/config.go b/model/config.go index 1e091785f..475e512f9 100644 --- a/model/config.go +++ b/model/config.go @@ -526,11 +526,6 @@ func (o *Config) SetDefaults() { o.FileSettings.AmazonS3Endpoint = "s3.amazonaws.com" } - if o.FileSettings.AmazonS3Region == "" { - // Defaults to "us-east-1" region. - o.FileSettings.AmazonS3Region = "us-east-1" - } - if o.FileSettings.AmazonS3SSL == nil { o.FileSettings.AmazonS3SSL = new(bool) *o.FileSettings.AmazonS3SSL = true // Secure by default. -- cgit v1.2.3-1-g7c22