From 49cff876c42ee0f72d0af20b0e71831213870bce Mon Sep 17 00:00:00 2001 From: Christopher Speller Date: Wed, 5 Aug 2015 09:00:26 -0400 Subject: Updating docker configuration files for release --- docker/0.6/config_docker.json | 2 +- docker/dev/config_docker.json | 16 ++++++++++++---- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/docker/0.6/config_docker.json b/docker/0.6/config_docker.json index fc3d2132a..128dc1274 100644 --- a/docker/0.6/config_docker.json +++ b/docker/0.6/config_docker.json @@ -86,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", 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", -- cgit v1.2.3-1-g7c22