summaryrefslogtreecommitdiffstats
path: root/config/config.json
diff options
context:
space:
mode:
Diffstat (limited to 'config/config.json')
-rw-r--r--config/config.json14
1 files changed, 12 insertions, 2 deletions
diff --git a/config/config.json b/config/config.json
index 085dd6de6..cfb3c2de8 100644
--- a/config/config.json
+++ b/config/config.json
@@ -23,10 +23,20 @@
"UseLocalStorage": true,
"StorageDirectory": "./data/"
},
+ "SSOSettings": {
+ "gitlab": {
+ "Allow": false,
+ "Secret" : "",
+ "Id": "",
+ "AuthEndpoint": "",
+ "TokenEndpoint": "",
+ "UserApiEndpoint": ""
+ }
+ },
"SqlSettings": {
"DriverName": "mysql",
- "DataSource": "mmuser:mostest@tcp(dockerhost:3306)/mattermost_test",
- "DataSourceReplicas": ["mmuser:mostest@tcp(dockerhost:3306)/mattermost_test"],
+ "DataSource": "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,