summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2017-04-24 07:57:51 -0400
committerJoram Wilander <jwawilander@gmail.com>2017-04-24 07:57:51 -0400
commit35ac2f35aac75e363cab16b77f3d5d6449dc744b (patch)
tree490bf9ef80daa4ac1138c9f40612c077aa4090e5 /config
parentf32ebc74a67e8f3264107802962da03638f30e6e (diff)
downloadchat-35ac2f35aac75e363cab16b77f3d5d6449dc744b.tar.gz
chat-35ac2f35aac75e363cab16b77f3d5d6449dc744b.tar.bz2
chat-35ac2f35aac75e363cab16b77f3d5d6449dc744b.zip
Fixing adding salts to config (#6209)
Diffstat (limited to 'config')
-rw-r--r--config/config.json12
1 files changed, 6 insertions, 6 deletions
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
+}