diff options
| author | =Corey Hulen <corey@hulen.com> | 2015-07-29 01:26:10 -0800 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2015-07-29 01:26:10 -0800 |
| commit | 9677a9f71777d75f3def0b0cb238050a30ec6a67 (patch) | |
| tree | 8579fae8134ef2167a2cc97d95b0225e8acfdb46 /config | |
| parent | 81e55eb57c367a1403f693712411c0781287ea55 (diff) | |
| download | chat-9677a9f71777d75f3def0b0cb238050a30ec6a67.tar.gz chat-9677a9f71777d75f3def0b0cb238050a30ec6a67.tar.bz2 chat-9677a9f71777d75f3def0b0cb238050a30ec6a67.zip | |
Fixes mm-1355 adds rate limiting apis
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.json | 10 | ||||
| -rw-r--r-- | config/config_docker.json | 10 |
2 files changed, 18 insertions, 2 deletions
diff --git a/config/config.json b/config/config.json index cfb3c2de8..40bb41e63 100644 --- a/config/config.json +++ b/config/config.json @@ -21,7 +21,8 @@ "ResetSalt": "IPxFzSfnDFsNsRafZxz8NaYqFKhf9y2t", "AnalyticsUrl": "", "UseLocalStorage": true, - "StorageDirectory": "./data/" + "StorageDirectory": "./data/", + "AllowedLoginAttempts": 3 }, "SSOSettings": { "gitlab": { @@ -68,6 +69,13 @@ "ApplePushCertPublic": "", "ApplePushCertPrivate": "" }, + "RateLimitSettings": { + "UseRateLimiter": true, + "PerSec": 10, + "MemoryStoreSize": 10000, + "VaryByRemoteAddr": true, + "VaryByHeader": "" + }, "PrivacySettings": { "ShowEmailAddress": true, "ShowPhoneNumber": true, diff --git a/config/config_docker.json b/config/config_docker.json index 2d5a34539..e4f37976d 100644 --- a/config/config_docker.json +++ b/config/config_docker.json @@ -21,7 +21,8 @@ "ResetSalt": "IPxFzSfnDFsNsRafZxz8NaYqFKhf9y2t", "AnalyticsUrl": "", "UseLocalStorage": true, - "StorageDirectory": "/mattermost/data/" + "StorageDirectory": "/mattermost/data/", + "AllowedLoginAttempts": 3 }, "SSOSettings": { "gitlab": { @@ -68,6 +69,13 @@ "ApplePushCertPublic": "", "ApplePushCertPrivate": "" }, + "RateLimitSettings": { + "UseRateLimiter": true, + "PerSec": 10, + "MemoryStoreSize": 10000, + "VaryByRemoteAddr": true, + "VaryByHeader": "" + }, "PrivacySettings": { "ShowEmailAddress": true, "ShowPhoneNumber": true, |