From b11484ad7073c3f9a41a76dc4a408953dd3d50d4 Mon Sep 17 00:00:00 2001
From: Nolan Lawson <nolan@nolanlawson.com>
Date: Mon, 9 Apr 2018 19:02:33 -0700
Subject: [PATCH] travis and postgres take two

---
 .travis.yml         | 1 +
 bin/run-mastodon.js | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index c78cc7b3..e4053a2c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,6 +21,7 @@ before_script:
   - postgres --version
   - redis-server --version
   - npm run lint
+  - psql -c "CREATE USER nolan CREATE_DB;"
 script: npm run test-browser
 env:
   global:
diff --git a/bin/run-mastodon.js b/bin/run-mastodon.js
index 2e0ad1fb..53e10d75 100644
--- a/bin/run-mastodon.js
+++ b/bin/run-mastodon.js
@@ -20,6 +20,8 @@ const envFile = `
 PAPERCLIP_SECRET=foo
 SECRET_KEY_BASE=bar
 OTP_SECRET=foobarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoobar
+DB_PORT=${process.env.PG_PORT || 5432}
+DB_USER=nolan
 `
 
 const mastodonDir = path.join(dir, '../mastodon')