2 files changed, 14 insertions, 3 deletions

diff --git a/bin/heroku b/bin/heroku
index f30b2b23..0375e9e7 100755
--- a/bin/heroku
+++ b/bin/heroku
@@ -19,10 +19,16 @@ module.exports = {
 
 EOF
 
-  cat << EOF > config.json
+    cat << EOF > config.json
 
 {
   "production": {
+    "db": {
+      "database": "${DATABASE_URL}",
+      "dialectOptions": {
+        "ssl": true
+      }
+    }
   }
 }
 
diff --git a/lib/models/index.js b/lib/models/index.js
index 3b49d459..d52f5508 100644
--- a/lib/models/index.js
+++ b/lib/models/index.js
@@ -11,7 +11,12 @@ var logger = require("../logger.js");
 
 var dbconfig = config.db;
 dbconfig.logging = config.debug ? logger.info : false;
-var sequelize = new Sequelize(dbconfig.database, dbconfig.username, dbconfig.password, dbconfig);
+
+var sequelize = null;
+if (dbconfig.hasOwnProperty('username') || dbconfig.hasOwnProperty('password'))
+    sequelize = new Sequelize(dbconfig.database, dbconfig.username, dbconfig.password, dbconfig);
+else
+    sequelize = new Sequelize(dbconfig.database, dbconfig);
 
 var db = {};
 
@@ -34,4 +39,4 @@ Object.keys(db).forEach(function (modelName) {
 db.sequelize = sequelize;
 db.Sequelize = Sequelize;
 
-module.exports = db;
\ No newline at end of file
+module.exports = db;