diff options
| author | Chris <ccbrown112@gmail.com> | 2017-08-20 23:47:14 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-20 23:47:14 -0500 |
| commit | 1222e6cd4172657143202882e7189274352e2cd5 (patch) | |
| tree | 1ac334164ae64366d960e3ba2b56df8849ec07af /Makefile | |
| parent | 4a8afebcdb8e8c88b4191d68cb1b5712d12cee9c (diff) | |
| download | chat-1222e6cd4172657143202882e7189274352e2cd5.tar.gz chat-1222e6cd4172657143202882e7189274352e2cd5.tar.bz2 chat-1222e6cd4172657143202882e7189274352e2cd5.zip | |
make config.json play nicely with version control (#7221)
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -279,6 +279,10 @@ test-te: start-docker prepare-enterprise do-cover-file test-postgres: start-docker prepare-enterprise @echo Testing Postgres + if [ ! -f config/config.json ]; then \ + cp config/default.json config/config.json; \ + fi; \ + @sed -i'' -e 's|"DriverName": "mysql"|"DriverName": "postgres"|g' config/config.json @sed -i'' -e 's|"DataSource": "mmuser:mostest@tcp(dockerhost:3306)/mattermost_test?charset=utf8mb4,utf8"|"DataSource": "postgres://mmuser:mostest@dockerhost:5432?sslmode=disable"|g' config/config.json @@ -387,6 +391,8 @@ package: build build-client cp -RL templates $(DIST_PATH) cp -RL i18n $(DIST_PATH) + mv $(DIST_PATH)/config/default.json $(DIST_PATH)/config/config.json + @# Disable developer settings sed -i'' -e 's|"ConsoleLevel": "DEBUG"|"ConsoleLevel": "INFO"|g' $(DIST_PATH)/config/config.json sed -i'' -e 's|"SiteURL": "http://localhost:8065"|"SiteURL": ""|g' $(DIST_PATH)/config/config.json |