From 228f979ed9210ae64b22bc7ede05bd870fd1e38a Mon Sep 17 00:00:00 2001
From: Nolan Lawson <nolan@nolanlawson.com>
Date: Mon, 9 Apr 2018 19:07:28 -0700
Subject: [PATCH] travis and postgres take three

---
 .travis.yml         | 6 +++---
 bin/run-mastodon.js | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e4053a2..a329920 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,13 +15,13 @@ services:
 before_install:
   - rvm install 2.5.0
   - rvm use 2.5.0
-before_script:
-  - node --version
   - ruby --version
+  - node --version
   - postgres --version
   - redis-server --version
+  - psql -c "CREATE USER nolan CREATEDB;"
+before_script:
   - 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 53e10d7..ed104ff 100644
--- a/bin/run-mastodon.js
+++ b/bin/run-mastodon.js
@@ -20,7 +20,7 @@ const envFile = `
 PAPERCLIP_SECRET=foo
 SECRET_KEY_BASE=bar
 OTP_SECRET=foobarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoobar
-DB_PORT=${process.env.PG_PORT || 5432}
+DB_PORT=${process.env.PGPORT || 5432}
 DB_USER=nolan
 `