Skip to content
This repository has been archived by the owner on Aug 30, 2021. It is now read-only.

Commit

Permalink
Merge pull request #733 from codydaig/enhancement/pull662
Browse files Browse the repository at this point in the history
Get site title from default environment config
  • Loading branch information
ilanbiala committed Jul 29, 2015
2 parents b7aebf3 + 40878bb commit 8104c98
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
4 changes: 3 additions & 1 deletion config/env/development.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
'use strict';

var defaultEnvConfig = require('./default');

module.exports = {
db: {
uri: process.env.MONGOHQ_URL || process.env.MONGOLAB_URI || 'mongodb://' + (process.env.DB_1_PORT_27017_TCP_ADDR || 'localhost') + '/mean-dev',
Expand All @@ -20,7 +22,7 @@ module.exports = {
}
},
app: {
title: 'MEAN.JS - Development Environment'
title: defaultEnvConfig.app.title + ' - Development Environment'
},
facebook: {
clientID: process.env.FACEBOOK_ID || 'APP_ID',
Expand Down
4 changes: 3 additions & 1 deletion config/env/test.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
'use strict';

var defaultEnvConfig = require('./default');

module.exports = {
db: {
uri: process.env.MONGOHQ_URL || process.env.MONGOLAB_URI || 'mongodb://' + (process.env.DB_1_PORT_27017_TCP_ADDR || 'localhost') + '/mean-test',
Expand All @@ -12,7 +14,7 @@ module.exports = {
},
port: process.env.PORT || 3001,
app: {
title: 'MEAN.JS - Test Environment'
title: defaultEnvConfig.app.title + ' - Test Environment'
},
facebook: {
clientID: process.env.FACEBOOK_ID || 'APP_ID',
Expand Down

0 comments on commit 8104c98

Please sign in to comment.