Merge branch 'master' into testing-heroku-review-apps

opentrials · Apr 1, 2016 · 7017683 · 7017683
2 parents fd62b9a + 4dd6b1d
commit 7017683
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/app.json b/app.json
@@ -5,12 +5,6 @@
     "postdeploy": "npm run migrate && npm run seed && npm run reindex"
   },
   "env": {
-    "ELASTICSEARCH_URL": {
-      "required": true
-    },
-    "DATABASE_URL": {
-      "required": true
-    }
   },
   "addons": [
     "heroku-postgresql",

diff --git a/config/index.js b/config/index.js
@@ -1,4 +1,10 @@
 require('dotenv').config();
+
+if (!process.env.ELASTICSEARCH_URL) {
+  // Fallback to SEARCHBOX_URL if ELASTICSEARCH_URL isn't set.
+  process.env.ELASTICSEARCH_URL = process.env.SEARCHBOX_SSL_URL;
+}
+
 const elasticsearch = require('elasticsearch');
 const path = require('path');
 const config = {