travis and postgres take three

nolanlawson · Apr 10, 2018 · 228f979 · 228f979
1 parent b11484a
commit 228f979
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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
 `