Skip to content

Commit

Permalink
Merge branch 'develop' of github.com:42Zavattas/generator-bangular in…
Browse files Browse the repository at this point in the history
…to develop
  • Loading branch information
balthazar committed Feb 7, 2015
2 parents 30728dc + 3778dbc commit 07e424e
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 4 deletions.
1 change: 0 additions & 1 deletion app/templates/server/config/environment/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ var all = {
root: path.normalize(__dirname + '/../../..'),
port: process.env.PORT || 9000,<% if (filters.backend === 'mongo') { %>

// MongoDB connection options
mongo: {
options: {
db: {
Expand Down
4 changes: 1 addition & 3 deletions app/templates/server/config/environment/production.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
module.exports = {
ip : process.env.IP || undefined<% if (filters.backend === 'mongo') { %>,
mongo: {
uri: process.env.MONGOLAB_URI ||
process.env.MONGOHQ_URL ||
'mongodb://localhost/<%= _.slugify(appname) %>'
uri: 'mongodb://localhost/<%= _.slugify(appname) %>'
}<% } %>
};

0 comments on commit 07e424e

Please sign in to comment.