From 35ac2f35aac75e363cab16b77f3d5d6449dc744b Mon Sep 17 00:00:00 2001
From: Christopher Speller <crspeller@gmail.com>
Date: Mon, 24 Apr 2017 07:57:51 -0400
Subject: Fixing adding salts to config (#6209)

---
 config/config.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'config/config.json')

diff --git a/config/config.json b/config/config.json
index d19027267..c8a52bd86 100644
--- a/config/config.json
+++ b/config/config.json
@@ -70,12 +70,12 @@
     },
     "SqlSettings": {
         "DriverName": "mysql",
-        "DataSource": "mmuser:mostest@tcp(dockerhost:3306)/mattermost_test?charset=utf8mb4,utf8\u0026readTimeout=30s\u0026writeTimeout=30s",
+        "DataSource": "mmuser:mostest@tcp(dockerhost:3306)/mattermost_test?charset=utf8mb4,utf8&readTimeout=30s&writeTimeout=30s",
         "DataSourceReplicas": [],
         "MaxIdleConns": 20,
         "MaxOpenConns": 300,
         "Trace": false,
-        "AtRestEncryptKey": "8s96y35qz5ihiz7w1jcecsqp5xnnkp13"
+        "AtRestEncryptKey": ""
     },
     "LogSettings": {
         "EnableConsole": true,
@@ -99,7 +99,7 @@
         "DriverName": "local",
         "Directory": "./data/",
         "EnablePublicLink": false,
-        "PublicLinkSalt": "1oidkhjpy4p54jwfrgwk7nhkzgwrq6ug",
+        "PublicLinkSalt": "",
         "ThumbnailWidth": 120,
         "ThumbnailHeight": 100,
         "PreviewWidth": 1024,
@@ -128,8 +128,8 @@
         "SMTPServer": "dockerhost",
         "SMTPPort": "2500",
         "ConnectionSecurity": "",
-        "InviteSalt": "mtt8hrn4tmo5d8nz91jg3z7gr8xudb4z",
-        "PasswordResetSalt": "8j44cnpee8b46a34kpnnc6r8gy6dizts",
+        "InviteSalt": "",
+        "PasswordResetSalt": "",
         "SendPushNotifications": false,
         "PushNotificationServer": "",
         "PushNotificationContents": "generic",
@@ -264,4 +264,4 @@
         "TurnUsername": "",
         "TurnSharedKey": ""
     }
-}
\ No newline at end of file
+}
-- 
cgit v1.2.3-1-g7c22