summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2016-01-06 09:18:52 -0500
committerChristopher Speller <crspeller@gmail.com>2016-01-06 09:18:52 -0500
commit0eb145218edb37d911cc5ec135b0006f866a44b2 (patch)
tree682f089b1298ae8108071ffa9fad2e135c132ed7 /config
parentfcb87ca42ff18e5fbf562b43390f4f99607289b1 (diff)
parenta0e3823e9cbe295591aa0a0946eafa42a94a6050 (diff)
downloadchat-0eb145218edb37d911cc5ec135b0006f866a44b2.tar.gz
chat-0eb145218edb37d911cc5ec135b0006f866a44b2.tar.bz2
chat-0eb145218edb37d911cc5ec135b0006f866a44b2.zip
Merge pull request #1816 from mattermost/PLT-1607
PLT-1607 adding more debugging info for email and push notifications
Diffstat (limited to 'config')
-rw-r--r--config/config.json8
1 files changed, 6 insertions, 2 deletions
diff --git a/config/config.json b/config/config.json
index 5469608f8..7c2ec9426 100644
--- a/config/config.json
+++ b/config/config.json
@@ -54,7 +54,11 @@
"AmazonS3AccessKeyId": "",
"AmazonS3SecretAccessKey": "",
"AmazonS3Bucket": "",
- "AmazonS3Region": ""
+ "AmazonS3Region": "",
+ "AmazonS3Endpoint": "",
+ "AmazonS3BucketEndpoint": "",
+ "AmazonS3LocationConstraint": false,
+ "AmazonS3LowercaseBucket": false
},
"EmailSettings": {
"EnableSignUpWithEmail": true,
@@ -100,4 +104,4 @@
"TokenEndpoint": "",
"UserApiEndpoint": ""
}
-}
+} \ No newline at end of file