diff options
| author | =Corey Hulen <corey@hulen.com> | 2015-09-21 19:01:52 -0700 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2015-09-21 19:01:52 -0700 |
| commit | e78c79b83213efc40bffc5ef42071fedb85d6061 (patch) | |
| tree | a9109f40bc8968c8fe9584b21dd4194d8a49c49c /config/config.json | |
| parent | cae5dbd245f05e9441156a3918ef796d92ecf331 (diff) | |
| download | chat-e78c79b83213efc40bffc5ef42071fedb85d6061.tar.gz chat-e78c79b83213efc40bffc5ef42071fedb85d6061.tar.bz2 chat-e78c79b83213efc40bffc5ef42071fedb85d6061.zip | |
Adding rate limiter settings to the admin console
Diffstat (limited to 'config/config.json')
| -rw-r--r-- | config/config.json | 46 |
1 files changed, 21 insertions, 25 deletions
diff --git a/config/config.json b/config/config.json index f9c49678f..e1907152b 100644 --- a/config/config.json +++ b/config/config.json @@ -1,12 +1,4 @@ { - "LogSettings": { - "ConsoleEnable": true, - "ConsoleLevel": "DEBUG", - "FileEnable": true, - "FileLevel": "INFO", - "FileFormat": "", - "FileLocation": "" - }, "ServiceSettings": { "SiteName": "Mattermost", "Mode": "dev", @@ -19,7 +11,18 @@ "ResetSalt": "IPxFzSfnDFsNsRafZxz8NaYqFKhf9y2t", "AnalyticsUrl": "", "AllowedLoginAttempts": 10, - "EnableOAuthServiceProvider": false + "EnableOAuthServiceProvider": false, + "SegmentDeveloperKey": "", + "GoogleDeveloperKey": "" + }, + "TeamSettings": { + "MaxUsersPerTeam": 150, + "AllowPublicLink": true, + "AllowValetDefault": false, + "TourLink": "", + "DefaultThemeColor": "#2389D7", + "DisableTeamCreation": false, + "RestrictCreationToDomains": "" }, "SqlSettings": { "DriverName": "mysql", @@ -32,6 +35,14 @@ "Trace": false, "AtRestEncryptKey": "Ya0xMrybACJ3sZZVWQC7e31h5nSDWZFS" }, + "LogSettings": { + "ConsoleEnable": true, + "ConsoleLevel": "DEBUG", + "FileEnable": true, + "FileLevel": "INFO", + "FileFormat": "", + "FileLocation": "" + }, "ImageSettings": { "DriverName": "local", "Directory": "./data/", @@ -63,7 +74,7 @@ "ApplePushCertPrivate": "" }, "RateLimitSettings": { - "UseRateLimiter": true, + "EnableRateLimiter": true, "PerSec": 10, "MemoryStoreSize": 10000, "VaryByRemoteAddr": true, @@ -71,23 +82,8 @@ }, "PrivacySettings": { "ShowEmailAddress": true, - "ShowPhoneNumber": true, - "ShowSkypeId": true, "ShowFullName": true }, - "ClientSettings": { - "SegmentDeveloperKey": "", - "GoogleDeveloperKey": "" - }, - "TeamSettings": { - "MaxUsersPerTeam": 150, - "AllowPublicLink": true, - "AllowValetDefault": false, - "TourLink": "", - "DefaultThemeColor": "#2389D7", - "DisableTeamCreation": false, - "RestrictCreationToDomains": "" - }, "SSOSettings": { "gitlab": { "Allow": false, |