diff options
author | Saturnino Abril <saturnino.abril@gmail.com> | 2017-09-07 00:02:42 +0800 |
---|---|---|
committer | Chris <ccbrown112@gmail.com> | 2017-09-06 11:02:42 -0500 |
commit | f968c56890bd84295672ee0d46cc846cac2dbd47 (patch) | |
tree | 029b386ed8e351f35cac7bfbab79aaed97eeb72d /webapp | |
parent | 90da40b54c5f7b36a3936bee2901fc645cc8ef4c (diff) | |
download | chat-f968c56890bd84295672ee0d46cc846cac2dbd47.tar.gz chat-f968c56890bd84295672ee0d46cc846cac2dbd47.tar.bz2 chat-f968c56890bd84295672ee0d46cc846cac2dbd47.zip |
Revert "[PLT-7475] Add S3 region to system console and add S3 validation (#7373)" (#7387)
This reverts commit 8d680cf64ec7fb6c8b242b8048989d0f0550cb68.
Move to 4.3.
Will discuss more if validation is necessary.
Diffstat (limited to 'webapp')
-rw-r--r-- | webapp/components/admin_console/storage_settings.jsx | 21 | ||||
-rwxr-xr-x | webapp/i18n/en.json | 2 |
2 files changed, 1 insertions, 22 deletions
diff --git a/webapp/components/admin_console/storage_settings.jsx b/webapp/components/admin_console/storage_settings.jsx index 54bbdb798..4b20a8b93 100644 --- a/webapp/components/admin_console/storage_settings.jsx +++ b/webapp/components/admin_console/storage_settings.jsx @@ -34,7 +34,6 @@ export default class StorageSettings extends AdminSettings { config.FileSettings.AmazonS3AccessKeyId = this.state.amazonS3AccessKeyId; config.FileSettings.AmazonS3SecretAccessKey = this.state.amazonS3SecretAccessKey; config.FileSettings.AmazonS3Bucket = this.state.amazonS3Bucket; - config.FileSettings.AmazonS3Region = this.state.amazonS3Region; config.FileSettings.AmazonS3Endpoint = this.state.amazonS3Endpoint; config.FileSettings.AmazonS3SSL = this.state.amazonS3SSL; config.FileSettings.AmazonS3SSE = this.state.amazonS3SSE; @@ -54,7 +53,6 @@ export default class StorageSettings extends AdminSettings { amazonS3AccessKeyId: config.FileSettings.AmazonS3AccessKeyId, amazonS3SecretAccessKey: config.FileSettings.AmazonS3SecretAccessKey, amazonS3Bucket: config.FileSettings.AmazonS3Bucket, - amazonS3Region: config.FileSettings.AmazonS3Region, amazonS3Endpoint: config.FileSettings.AmazonS3Endpoint, amazonS3SSL: config.FileSettings.AmazonS3SSL, amazonS3SSE: config.FileSettings.AmazonS3SSE, @@ -244,25 +242,6 @@ export default class StorageSettings extends AdminSettings { disabled={this.state.driverName !== DRIVER_S3} /> <TextSetting - id='amazonS3Region' - label={ - <FormattedMessage - id='admin.image.amazonS3RegionTitle' - defaultMessage='Amazon S3 Region:' - /> - } - placeholder={Utils.localizeMessage('admin.image.amazonS3RegionExample', 'Ex "us-east-1"')} - helpText={ - <FormattedMessage - id='admin.image.amazonS3RegionDescription' - defaultMessage='(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.' - /> - } - value={this.state.amazonS3Region} - onChange={this.handleChange} - disabled={this.state.driverName !== DRIVER_S3} - /> - <TextSetting id='amazonS3Endpoint' label={ <FormattedMessage diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index 4ad2f6abf..91ebd13c6 100755 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -475,7 +475,7 @@ "admin.image.amazonS3IdDescription": "Obtain this credential from your Amazon EC2 administrator.", "admin.image.amazonS3IdExample": "E.g.: \"AKIADTOVBGERKLCBV\"", "admin.image.amazonS3IdTitle": "Amazon S3 Access Key ID:", - "admin.image.amazonS3RegionDescription": "(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.", + "admin.image.amazonS3RegionDescription": "AWS region you selected for creating your S3 bucket.", "admin.image.amazonS3RegionExample": "E.g.: \"us-east-1\"", "admin.image.amazonS3RegionTitle": "Amazon S3 Region:", "admin.image.amazonS3SSEDescription": "When true, encrypt files in Amazon S3 using server-side encryption with Amazon S3-managed keys. See <a href=\"https://about.mattermost.com/default-server-side-encryption\">documentation</a> to learn more.", |