diff options
| author | =Corey Hulen <corey@hulen.com> | 2015-08-02 09:41:12 -0800 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2015-08-02 09:41:12 -0800 |
| commit | 247708d924770737a3c03f956b19d8096da2bdea (patch) | |
| tree | 3d6bd381545e660808f74a1379048e57cc0c6717 /docker | |
| parent | e76fc37b6df7d53ea86a5b42009d5d1161741270 (diff) | |
| parent | 718d670d699e295fcad903d507bc989c51a1ef50 (diff) | |
| download | chat-247708d924770737a3c03f956b19d8096da2bdea.tar.gz chat-247708d924770737a3c03f956b19d8096da2bdea.tar.bz2 chat-247708d924770737a3c03f956b19d8096da2bdea.zip | |
Merge branch 'master' into mm-1619
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/0.6/config_docker.json | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/docker/0.6/config_docker.json b/docker/0.6/config_docker.json index 6d220f919..fc3d2132a 100644 --- a/docker/0.6/config_docker.json +++ b/docker/0.6/config_docker.json @@ -21,7 +21,8 @@ "ResetSalt": "IPxFzSfnDFsNsRafZxz8NaYqFKhf9y2t", "AnalyticsUrl": "", "UseLocalStorage": true, - "StorageDirectory": "/mattermost/data/" + "StorageDirectory": "/mattermost/data/", + "AllowedLoginAttempts": 10 }, "SSOSettings": { "gitlab": { @@ -49,8 +50,8 @@ "S3Region": "" }, "ImageSettings": { - "ThumbnailWidth": 200, - "ThumbnailHeight": 0, + "ThumbnailWidth": 120, + "ThumbnailHeight": 100, "PreviewWidth": 1024, "PreviewHeight": 0, "ProfileWidth": 128, @@ -69,6 +70,13 @@ "ApplePushCertPublic": "", "ApplePushCertPrivate": "" }, + "RateLimitSettings": { + "UseRateLimiter": true, + "PerSec": 10, + "MemoryStoreSize": 10000, + "VaryByRemoteAddr": true, + "VaryByHeader": "" + }, "PrivacySettings": { "ShowEmailAddress": true, "ShowPhoneNumber": true, |