From e78c79b83213efc40bffc5ef42071fedb85d6061 Mon Sep 17 00:00:00 2001
From: =Corey Hulen <corey@hulen.com>
Date: Mon, 21 Sep 2015 19:01:52 -0700
Subject: Adding rate limiter settings to the admin console

---
 config/config.json | 46 +++++++++++++++++++++-------------------------
 1 file changed, 21 insertions(+), 25 deletions(-)

(limited to 'config/config.json')

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,
-- 
cgit v1.2.3-1-g7c22