updating support for mongodb connection string to support special cha…

…rs for username and password
edwardysun · Nov 29, 2014 · 5b7423c · 5b7423c
1 parent 1b3cc8c
commit 5b7423c
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 5 deletions.
diff --git a/config/env/development.js b/config/env/development.js
@@ -1,7 +1,13 @@
 'use strict';
 
 module.exports = {
-	db: 'mongodb://localhost/mean-dev',
+	db: {
+		uri: 'mongodb://localhost/mean-dev',
+		options: {
+			user: '',
+			pass: ''
+		}
+	},
 	log: {
 		// Can specify one of 'combined', 'common', 'dev', 'short', 'tiny'
 		format: 'dev',

diff --git a/config/env/production.js b/config/env/production.js
@@ -1,7 +1,13 @@
 'use strict';
 
 module.exports = {
-	db: process.env.MONGOHQ_URL || process.env.MONGOLAB_URI || 'mongodb://' + (process.env.DB_1_PORT_27017_TCP_ADDR || 'localhost') + '/mean',
+	db: {
+		uri: process.env.MONGOHQ_URL || process.env.MONGOLAB_URI || 'mongodb://' + (process.env.DB_1_PORT_27017_TCP_ADDR || 'localhost') + '/mean',
+		options: {
+			user: '',
+			pass: ''
+		}
+	},
 	log: {
 		// Can specify one of 'combined', 'common', 'dev', 'short', 'tiny'
 		format: 'combined',

diff --git a/config/env/secure.js b/config/env/secure.js
@@ -2,7 +2,13 @@
 
 module.exports = {
 	port: 443,
-	db: process.env.MONGOHQ_URL || process.env.MONGOLAB_URI || 'mongodb://localhost/mean',
+	db: {
+		uri: process.env.MONGOHQ_URL || process.env.MONGOLAB_URI || 'mongodb://localhost/mean',
+		options: {
+			user: '',
+			pass: ''
+		}
+	},
 	log: {
 		// Can specify one of 'combined', 'common', 'dev', 'short', 'tiny'
 		format: 'combined',

diff --git a/config/env/test.js b/config/env/test.js
@@ -1,7 +1,13 @@
 'use strict';
 
 module.exports = {
-	db: 'mongodb://localhost/mean-test',
+	db: {
+		uri: 'mongodb://localhost/mean-test',
+		options: {
+			user: '',
+			pass: ''
+		}
+	},
 	port: 3001,
 	log: {
 		// Can specify one of 'combined', 'common', 'dev', 'short', 'tiny'

diff --git a/server.js b/server.js
@@ -13,7 +13,7 @@ var init = require('./config/init')(),
  */
 
 // Bootstrap db connection
-var db = mongoose.connect(config.db, function(err) {
+var db = mongoose.connect(config.db.uri, config.db.options, function(err) {
 	if (err) {
 		console.error(chalk.red('Could not connect to MongoDB!'));
 		console.log(chalk.red(err));