diff options
| author | Bret Mogilefsky <bmogilefsky@gmail.com> | 2017-11-24 09:58:13 -0800 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2017-11-24 09:58:12 -0800 |
| commit | e85ec3830164ffdfbe8fd5696ab99446b38a01ef (patch) | |
| tree | 8b8df5089461294893d02d16bc725ec69c59ad39 /config | |
| parent | fdbfb9a4ed722bfe138ecaf7c5b308191c13925f (diff) | |
| download | chat-e85ec3830164ffdfbe8fd5696ab99446b38a01ef.tar.gz chat-e85ec3830164ffdfbe8fd5696ab99446b38a01ef.tar.bz2 chat-e85ec3830164ffdfbe8fd5696ab99446b38a01ef.zip | |
Don't force AmazonS3Region (#7830)
In [this issue](https://mattermost.atlassian.net/browse/PLT-7475), it says that the UI text should be `Help Text: (Optional) AWS region you selected when creating your S3 bucket. If no region is set, Mattermost attempts to get the appropriate region from AWS, or sets it to "us-east-1" if none found.`
The [Mattermost documentation](https://docs.mattermost.com/administration/config-settings.html#amazon-s3-region) says the default for this value is `""`, but it's set here. For this reason the behavior described above (getting the appropriate region from AWS, then falling back to `us-east-1` only if that fails) **does not happen**; Mattermost tries region `us-east-1` even if `AmazonS3Endpoint` points to a different region.
Diffstat (limited to 'config')
| -rw-r--r-- | config/default.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/default.json b/config/default.json index 0acbe9c7c..96eb0ed63 100644 --- a/config/default.json +++ b/config/default.json @@ -131,7 +131,7 @@ "AmazonS3AccessKeyId": "", "AmazonS3SecretAccessKey": "", "AmazonS3Bucket": "", - "AmazonS3Region": "us-east-1", + "AmazonS3Region": "", "AmazonS3Endpoint": "s3.amazonaws.com", "AmazonS3SSL": true, "AmazonS3SignV2": false, |