diff options
| author | Corey Hulen <corey@hulen.com> | 2015-07-23 11:21:54 -0800 |
|---|---|---|
| committer | Corey Hulen <corey@hulen.com> | 2015-07-23 11:21:54 -0800 |
| commit | b813234f4cc38e72bb94556d3a4acdcde5071468 (patch) | |
| tree | f9a0eb8f9596c91531c6997617b4dd66e05dd317 /config | |
| parent | 32e8dddd0cd8532e45f89290a154d5d7911c16dd (diff) | |
| parent | 98751a4f65a656839dc3724e72e672b585cb18c9 (diff) | |
| download | chat-b813234f4cc38e72bb94556d3a4acdcde5071468.tar.gz chat-b813234f4cc38e72bb94556d3a4acdcde5071468.tar.bz2 chat-b813234f4cc38e72bb94556d3a4acdcde5071468.zip | |
Merge pull request #170 from mattermost/mm-1420
Fixes mm-1420 adding initial support for postgres
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.json | 4 | ||||
| -rw-r--r-- | config/config_docker.json | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/config/config.json b/config/config.json index 591e38422..cfb3c2de8 100644 --- a/config/config.json +++ b/config/config.json @@ -35,8 +35,8 @@ }, "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, diff --git a/config/config_docker.json b/config/config_docker.json index a9ed98f1a..2d5a34539 100644 --- a/config/config_docker.json +++ b/config/config_docker.json @@ -35,8 +35,8 @@ }, "SqlSettings": { "DriverName": "mysql", - "DataSource": "mmuser:mostest@tcp(localhost:3306)/mattermost_test", - "DataSourceReplicas": ["mmuser:mostest@tcp(localhost:3306)/mattermost_test"], + "DataSource": "mmuser:mostest@tcp(localhost:3306)/mattermost_test?charset=utf8mb4,utf8", + "DataSourceReplicas": ["mmuser:mostest@tcp(localhost:3306)/mattermost_test?charset=utf8mb4,utf8"], "MaxIdleConns": 10, "MaxOpenConns": 10, "Trace": false, |