diff options
| author | Corey Hulen <corey@hulen.com> | 2015-08-02 09:17:37 -0800 |
|---|---|---|
| committer | Corey Hulen <corey@hulen.com> | 2015-08-02 09:17:37 -0800 |
| commit | 4d1562c5de377741734a0ad4e8eb30a83d301262 (patch) | |
| tree | 74d1d7821b3863231c2d9429b6ccb48728661b30 /config/config.json | |
| parent | adc8def9e06a7908d5f092088922dc26cbb277df (diff) | |
| parent | d93bf60248f066542d0851a7b6847f925975d77f (diff) | |
| download | chat-4d1562c5de377741734a0ad4e8eb30a83d301262.tar.gz chat-4d1562c5de377741734a0ad4e8eb30a83d301262.tar.bz2 chat-4d1562c5de377741734a0ad4e8eb30a83d301262.zip | |
Merge pull request #273 from mattermost/mm-1355
Fixes mm-1355 adds rate limiting apis
Diffstat (limited to 'config/config.json')
| -rw-r--r-- | config/config.json | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/config/config.json b/config/config.json index 10a8b6553..c446b517c 100644 --- a/config/config.json +++ b/config/config.json @@ -21,7 +21,8 @@ "ResetSalt": "IPxFzSfnDFsNsRafZxz8NaYqFKhf9y2t", "AnalyticsUrl": "", "UseLocalStorage": true, - "StorageDirectory": "./data/" + "StorageDirectory": "./data/", + "AllowedLoginAttempts": 10 }, "SSOSettings": { "gitlab": { @@ -69,6 +70,13 @@ "ApplePushCertPublic": "", "ApplePushCertPrivate": "" }, + "RateLimitSettings": { + "UseRateLimiter": true, + "PerSec": 10, + "MemoryStoreSize": 10000, + "VaryByRemoteAddr": true, + "VaryByHeader": "" + }, "PrivacySettings": { "ShowEmailAddress": true, "ShowPhoneNumber": true, |