diff options
Diffstat (limited to 'webapp')
-rw-r--r-- | webapp/components/admin_console/storage_settings.jsx | 24 | ||||
-rwxr-xr-x | webapp/i18n/en.json | 4 |
2 files changed, 23 insertions, 5 deletions
diff --git a/webapp/components/admin_console/storage_settings.jsx b/webapp/components/admin_console/storage_settings.jsx index b591758b1..4b20a8b93 100644 --- a/webapp/components/admin_console/storage_settings.jsx +++ b/webapp/components/admin_console/storage_settings.jsx @@ -37,6 +37,7 @@ export default class StorageSettings extends AdminSettings { config.FileSettings.AmazonS3Endpoint = this.state.amazonS3Endpoint; config.FileSettings.AmazonS3SSL = this.state.amazonS3SSL; config.FileSettings.AmazonS3SSE = this.state.amazonS3SSE; + config.FileSettings.AmazonS3Trace = this.state.amazonS3Trace; return config; } @@ -54,7 +55,8 @@ export default class StorageSettings extends AdminSettings { amazonS3Bucket: config.FileSettings.AmazonS3Bucket, amazonS3Endpoint: config.FileSettings.AmazonS3Endpoint, amazonS3SSL: config.FileSettings.AmazonS3SSL, - amazonS3SSE: config.FileSettings.AmazonS3SSE + amazonS3SSE: config.FileSettings.AmazonS3SSE, + amazonS3Trace: config.FileSettings.AmazonS3Trace }; } @@ -125,7 +127,6 @@ export default class StorageSettings extends AdminSettings { defaultMessage='Enable Server-Side Encryption for Amazon S3:' /> } - placeholder={Utils.localizeMessage('admin.image.amazonS3SSEExample', 'Ex "false"')} helpText={ <FormattedHTMLMessage id='admin.image.amazonS3SSEDescription' @@ -267,7 +268,6 @@ export default class StorageSettings extends AdminSettings { defaultMessage='Enable Secure Amazon S3 Connections:' /> } - placeholder={Utils.localizeMessage('admin.image.amazonS3SSLExample', 'Ex "true"')} helpText={ <FormattedMessage id='admin.image.amazonS3SSLDescription' @@ -280,6 +280,24 @@ export default class StorageSettings extends AdminSettings { /> {amazonSSEComp} <BooleanSetting + id='amazonS3Trace' + label={ + <FormattedMessage + id='admin.image.amazonS3TraceTitle' + defaultMessage='Enable Amazon S3 Debugging:' + /> + } + helpText={ + <FormattedMessage + id='admin.image.amazonS3TraceDescription' + defaultMessage='(Development Mode) When true, log additional debugging information to the system logs.' + /> + } + value={this.state.amazonS3Trace} + onChange={this.handleChange} + disabled={this.state.driverName !== DRIVER_S3} + /> + <BooleanSetting id='enableFileAttachments' label={ <FormattedMessage diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index 635c619a3..f111c5dd5 100755 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -479,14 +479,14 @@ "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.", - "admin.image.amazonS3SSEExample": "E.g.: \"false\"", "admin.image.amazonS3SSETitle": "Enable Server-Side Encryption for Amazon S3:", "admin.image.amazonS3SSLDescription": "When false, allow insecure connections to Amazon S3. Defaults to secure connections only.", - "admin.image.amazonS3SSLExample": "E.g.: \"true\"", "admin.image.amazonS3SSLTitle": "Enable Secure Amazon S3 Connections:", "admin.image.amazonS3SecretDescription": "Obtain this credential from your Amazon EC2 administrator.", "admin.image.amazonS3SecretExample": "E.g.: \"jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY\"", "admin.image.amazonS3SecretTitle": "Amazon S3 Secret Access Key:", + "admin.image.amazonS3TraceDescription": "(Development Mode) When true, log additional debugging information to the system logs.", + "admin.image.amazonS3TraceTitle": "Enable Amazon S3 Debugging:", "admin.image.localDescription": "Directory to which files and images are written. If blank, defaults to ./data/.", "admin.image.localExample": "E.g.: \"./data/\"", "admin.image.localTitle": "Local Storage Directory:", |