Merge branch 'master' of github.com:jshultz/mean-1

taobataoma · Mar 9, 2014 · 31ec93a · 31ec93a
2 parents c06a9ae + 7edb6b8
commit 31ec93a
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/config/env/all.js b/config/env/all.js
@@ -9,7 +9,6 @@ module.exports = {
 		description: 'Full-Stack JavaScript with MongoDB, Express, AngularJS, and Node.js',
 		keywords: 'mongodb, express, angularjs, node.js, mongoose, passport'
 	},
-	db: process.env.MONGOHQ_URL || process.env.MONGOLAB_URI,
 	root: rootPath,
 	port: process.env.PORT || 3000,
 	templateEngine: 'swig',

diff --git a/config/env/production.js b/config/env/production.js
@@ -1,7 +1,7 @@
 'use strict';
 
 module.exports = {
-	db: 'mongodb://localhost/mean',
+    db: process.env.MONGOHQ_URL || process.env.MONGOLAB_URI,
 	facebook: {
 		clientID: 'APP_ID',
 		clientSecret: 'APP_SECRET',