diff options
| author | Christopher Speller <crspeller@gmail.com> | 2015-08-05 12:29:28 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2015-08-05 12:29:28 -0400 |
| commit | 201d165ed9552a39667eb997d381f893f1b12446 (patch) | |
| tree | 176fdf85beb1b1ab9deff99fe2c011911c75cfdf /docker/dev/config_docker.json | |
| parent | 7692e67728cc471a5ac8903a859eba9d82c6429e (diff) | |
| parent | a2d26be5df2e4b3f73176044d92c923bb3899798 (diff) | |
| download | chat-201d165ed9552a39667eb997d381f893f1b12446.tar.gz chat-201d165ed9552a39667eb997d381f893f1b12446.tar.bz2 chat-201d165ed9552a39667eb997d381f893f1b12446.zip | |
Merge pull request #342 from mattermost/release-0.6.0
Release 0.6.0
Diffstat (limited to 'docker/dev/config_docker.json')
| -rw-r--r-- | docker/dev/config_docker.json | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/docker/dev/config_docker.json b/docker/dev/config_docker.json index f6b1e7b79..cd612c7fe 100644 --- a/docker/dev/config_docker.json +++ b/docker/dev/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, @@ -78,7 +86,7 @@ "TeamSettings": { "MaxUsersPerTeam": 150, "AllowPublicLink": true, - "AllowValet": false, + "AllowValetDefault": false, "TermsLink": "/static/help/configure_links.html", "PrivacyLink": "/static/help/configure_links.html", "AboutLink": "/static/help/configure_links.html", |