diff options
author | =Corey Hulen <corey@hulen.com> | 2015-09-22 00:00:19 -0700 |
---|---|---|
committer | =Corey Hulen <corey@hulen.com> | 2015-09-22 00:00:19 -0700 |
commit | f05a2c03d5dbf5b0b7d09148a37d2325012b309f (patch) | |
tree | fed7e6d3653bc8ed449f83f7cbc1dc71a4a49cd9 /config | |
parent | afcff9b301ed45687ab7021709af8b2cf338355b (diff) | |
download | chat-f05a2c03d5dbf5b0b7d09148a37d2325012b309f.tar.gz chat-f05a2c03d5dbf5b0b7d09148a37d2325012b309f.tar.bz2 chat-f05a2c03d5dbf5b0b7d09148a37d2325012b309f.zip |
Adding SQL settings to admin console
Diffstat (limited to 'config')
-rw-r--r-- | config/config.json | 8 |
1 files changed, 3 insertions, 5 deletions
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": "", |