travis and postgres take two

nolanlawson · Apr 10, 2018 · b11484a · b11484a
1 parent 28db887
commit b11484a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git 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
@@ -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')