From 44714dfcb18b9a393dc34be3c182b0c092eec28a Mon Sep 17 00:00:00 2001
From: =Corey Hulen <corey@hulen.com>
Date: Thu, 17 Sep 2015 21:00:59 -0700
Subject: PLT-11 Adding ability to save config file

---
 config/config.json | 37 +++++++++++++++++++------------------
 1 file changed, 19 insertions(+), 18 deletions(-)

(limited to 'config')

diff --git a/config/config.json b/config/config.json
index 4c4fbb255..38948641c 100644
--- a/config/config.json
+++ b/config/config.json
@@ -9,13 +9,11 @@
     },
     "ServiceSettings": {
         "SiteName": "Mattermost",
-        "Mode" : "dev",
-		"AllowTesting" : false,
+        "Mode": "dev",
+        "AllowTesting": false,
         "UseSSL": false,
         "Port": "8065",
         "Version": "developer",
-        "Shards": {
-        },
         "InviteSalt": "gxHVDcKUyP2y1eiyW8S8na1UYQAfq6J6",
         "PublicLinkSalt": "TO3pTyXIZzwHiwyZgGql7lM7DG3zeId4",
         "ResetSalt": "IPxFzSfnDFsNsRafZxz8NaYqFKhf9y2t",
@@ -26,21 +24,12 @@
         "DisableEmailSignUp": false,
         "EnableOAuthServiceProvider": false
     },
-    "SSOSettings": {
-        "gitlab": {
-            "Allow": false,
-            "Secret" : "",
-            "Id": "",
-            "Scope": "",
-            "AuthEndpoint": "",
-            "TokenEndpoint": "",
-            "UserApiEndpoint": ""
-        }
-    },
     "SqlSettings": {
         "DriverName": "mysql",
         "DataSource": "mmuser:mostest@tcp(dockerhost:3306)/mattermost_test?charset=utf8mb4,utf8",
-        "DataSourceReplicas": ["mmuser:mostest@tcp(dockerhost:3306)/mattermost_test?charset=utf8mb4,utf8"],
+        "DataSourceReplicas": [
+            "mmuser:mostest@tcp(dockerhost:3306)/mattermost_test?charset=utf8mb4,utf8"
+        ],
         "MaxIdleConns": 10,
         "MaxOpenConns": 10,
         "Trace": false,
@@ -62,7 +51,7 @@
         "InitialFont": "luximbi.ttf"
     },
     "EmailSettings": {
-        "ByPassEmail" : true,
+        "ByPassEmail": true,
         "SMTPUsername": "",
         "SMTPPassword": "",
         "SMTPServer": "",
@@ -95,8 +84,20 @@
         "MaxUsersPerTeam": 150,
         "AllowPublicLink": true,
         "AllowValetDefault": false,
+        "TourLink": "",
         "DefaultThemeColor": "#2389D7",
         "DisableTeamCreation": false,
         "RestrictCreationToDomains": ""
+    },
+    "SSOSettings": {
+        "gitlab": {
+            "Allow": false,
+            "Secret": "",
+            "Id": "",
+            "Scope": "",
+            "AuthEndpoint": "",
+            "TokenEndpoint": "",
+            "UserApiEndpoint": ""
+        }
     }
-}
+}
\ No newline at end of file
-- 
cgit v1.2.3-1-g7c22