From f05a2c03d5dbf5b0b7d09148a37d2325012b309f Mon Sep 17 00:00:00 2001
From: =Corey Hulen <corey@hulen.com>
Date: Tue, 22 Sep 2015 00:00:19 -0700
Subject: Adding SQL settings to admin console

---
 config/config.json | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'config/config.json')

diff --git a/config/config.json b/config/config.json
index 108271bca..8baa09859 100644
--- a/config/config.json
+++ b/config/config.json
@@ -27,13 +27,11 @@
     "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": [],
         "MaxIdleConns": 10,
         "MaxOpenConns": 10,
         "Trace": false,
-        "AtRestEncryptKey": "Ya0xMrybACJ3sZZVWQC7e31h5nSDWZFS"
+        "AtRestEncryptKey": "7rAh6iwQCkV4cA1Gsg3fgGOXJAQ43QV"
     },
     "LogSettings": {
         "ConsoleEnable": true,
@@ -84,7 +82,7 @@
         "ShowEmailAddress": true,
         "ShowFullName": true
     },
-    "GitLabSSOSettings": {
+    "GitLabSettings": {
         "Allow": false,
         "Secret": "",
         "Id": "",
-- 
cgit v1.2.3-1-g7c22