diff options
author | Christopher Speller <crspeller@gmail.com> | 2016-01-06 09:18:52 -0500 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2016-01-06 09:18:52 -0500 |
commit | 0eb145218edb37d911cc5ec135b0006f866a44b2 (patch) | |
tree | 682f089b1298ae8108071ffa9fad2e135c132ed7 /docker | |
parent | fcb87ca42ff18e5fbf562b43390f4f99607289b1 (diff) | |
parent | a0e3823e9cbe295591aa0a0946eafa42a94a6050 (diff) | |
download | chat-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 'docker')
-rw-r--r-- | docker/dev/config_docker.json | 6 | ||||
-rw-r--r-- | docker/local/config_docker.json | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/docker/dev/config_docker.json b/docker/dev/config_docker.json index 2c109c105..3a5195de3 100644 --- a/docker/dev/config_docker.json +++ b/docker/dev/config_docker.json @@ -54,7 +54,11 @@ "AmazonS3AccessKeyId": "", "AmazonS3SecretAccessKey": "", "AmazonS3Bucket": "", - "AmazonS3Region": "" + "AmazonS3Region": "", + "AmazonS3Endpoint": "", + "AmazonS3BucketEndpoint": "", + "AmazonS3LocationConstraint": false, + "AmazonS3LowercaseBucket": false }, "EmailSettings": { "EnableSignUpWithEmail": true, diff --git a/docker/local/config_docker.json b/docker/local/config_docker.json index 2c109c105..3a5195de3 100644 --- a/docker/local/config_docker.json +++ b/docker/local/config_docker.json @@ -54,7 +54,11 @@ "AmazonS3AccessKeyId": "", "AmazonS3SecretAccessKey": "", "AmazonS3Bucket": "", - "AmazonS3Region": "" + "AmazonS3Region": "", + "AmazonS3Endpoint": "", + "AmazonS3BucketEndpoint": "", + "AmazonS3LocationConstraint": false, + "AmazonS3LowercaseBucket": false }, "EmailSettings": { "EnableSignUpWithEmail": true, |