summaryrefslogtreecommitdiffstats
path: root/app/diagnostics.go
diff options
context:
space:
mode:
authorTejay Cardon <tejay.cardon@gmail.com>2017-08-08 08:15:20 -0600
committerHarrison Healey <harrisonmhealey@gmail.com>2017-08-08 10:15:20 -0400
commit2105b10ccdff58a6d1986776c37fc179249f369f (patch)
tree2f9192a951ce39c3c2dceaf14d48fb0b756d331f /app/diagnostics.go
parent7683e751ab7c8dee28e8ec8f2dcf3edd1048fe29 (diff)
downloadchat-2105b10ccdff58a6d1986776c37fc179249f369f.tar.gz
chat-2105b10ccdff58a6d1986776c37fc179249f369f.tar.bz2
chat-2105b10ccdff58a6d1986776c37fc179249f369f.zip
FIXES PLT-6648 Add support for Server Side Encryption on S3 (#6467)
Help from Jason Blais on wording Update storage_settings.jsx Update en.json
Diffstat (limited to 'app/diagnostics.go')
-rw-r--r--app/diagnostics.go1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/diagnostics.go b/app/diagnostics.go
index f12681d01..983ce8077 100644
--- a/app/diagnostics.go
+++ b/app/diagnostics.go
@@ -275,6 +275,7 @@ func trackConfig() {
"enable_public_links": utils.Cfg.FileSettings.EnablePublicLink,
"driver_name": utils.Cfg.FileSettings.DriverName,
"amazon_s3_ssl": *utils.Cfg.FileSettings.AmazonS3SSL,
+ "amazon_s3_sse": *utils.Cfg.FileSettings.AmazonS3SSE,
"amazon_s3_signv2": *utils.Cfg.FileSettings.AmazonS3SignV2,
"max_file_size": *utils.Cfg.FileSettings.MaxFileSize,
"enable_file_attachments": *utils.Cfg.FileSettings.EnableFileAttachments,