diff options
| author | Harshavardhana <harsha@minio.io> | 2017-07-31 09:22:52 -0700 |
|---|---|---|
| committer | Harrison Healey <harrisonmhealey@gmail.com> | 2017-07-31 12:22:52 -0400 |
| commit | 489602efe5e099f57bb2b58b7c67f8fc104ff5db (patch) | |
| tree | 1b5c021ba02d6495f85e9dd8d2a43406f74e0308 /model | |
| parent | c506c5cac6627a42af778d744cdd36d6d7abaeb2 (diff) | |
| download | chat-489602efe5e099f57bb2b58b7c67f8fc104ff5db.tar.gz chat-489602efe5e099f57bb2b58b7c67f8fc104ff5db.tar.bz2 chat-489602efe5e099f57bb2b58b7c67f8fc104ff5db.zip | |
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
Diffstat (limited to 'model')
| -rw-r--r-- | model/config.go | 5 |
1 files changed, 0 insertions, 5 deletions
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. |