Skip to content

Commit 49cff87

Browse files
committed
Updating docker configuration files for release
1 parent 5a1f4b0 commit 49cff87

File tree

2 files changed

+13
-5
lines changed

2 files changed

+13
-5
lines changed

docker/0.6/config_docker.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
"TeamSettings": {
8787
"MaxUsersPerTeam": 150,
8888
"AllowPublicLink": true,
89-
"AllowValet": false,
89+
"AllowValetDefault": false,
9090
"TermsLink": "/static/help/configure_links.html",
9191
"PrivacyLink": "/static/help/configure_links.html",
9292
"AboutLink": "/static/help/configure_links.html",

docker/dev/config_docker.json

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@
2121
"ResetSalt": "IPxFzSfnDFsNsRafZxz8NaYqFKhf9y2t",
2222
"AnalyticsUrl": "",
2323
"UseLocalStorage": true,
24-
"StorageDirectory": "/mattermost/data/"
24+
"StorageDirectory": "/mattermost/data/",
25+
"AllowedLoginAttempts": 10
2526
},
2627
"SSOSettings": {
2728
"gitlab": {
@@ -49,8 +50,8 @@
4950
"S3Region": ""
5051
},
5152
"ImageSettings": {
52-
"ThumbnailWidth": 200,
53-
"ThumbnailHeight": 0,
53+
"ThumbnailWidth": 120,
54+
"ThumbnailHeight": 100,
5455
"PreviewWidth": 1024,
5556
"PreviewHeight": 0,
5657
"ProfileWidth": 128,
@@ -69,6 +70,13 @@
6970
"ApplePushCertPublic": "",
7071
"ApplePushCertPrivate": ""
7172
},
73+
"RateLimitSettings": {
74+
"UseRateLimiter": true,
75+
"PerSec": 10,
76+
"MemoryStoreSize": 10000,
77+
"VaryByRemoteAddr": true,
78+
"VaryByHeader": ""
79+
},
7280
"PrivacySettings": {
7381
"ShowEmailAddress": true,
7482
"ShowPhoneNumber": true,
@@ -78,7 +86,7 @@
7886
"TeamSettings": {
7987
"MaxUsersPerTeam": 150,
8088
"AllowPublicLink": true,
81-
"AllowValet": false,
89+
"AllowValetDefault": false,
8290
"TermsLink": "/static/help/configure_links.html",
8391
"PrivacyLink": "/static/help/configure_links.html",
8492
"AboutLink": "/static/help/configure_links.html",

0 commit comments

Comments
 (0)