Skip to content

Commit

Permalink
linnovate#332 fix travis
Browse files Browse the repository at this point in the history
  • Loading branch information
fyockm committed Mar 30, 2014
1 parent 4bb9e28 commit 5df3a05
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ language: node_js
node_js:
- "0.10"
env:
- NODE_ENV=travis
- NODE_ENV=development
services:
- mongodb
- mongodb
2 changes: 1 addition & 1 deletion gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ module.exports = function(grunt) {
nodeArgs: ['--debug'],
delayTime: 1,
env: {
PORT: require('./config/config').port
PORT: require('./server/config/config').port
},
cwd: __dirname
}
Expand Down
2 changes: 1 addition & 1 deletion server/config/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ var _ = require('lodash'),

// Load configurations
// Set the node environment variable if not set before
process.env.NODE_ENV = ~fs.readdirSync('./env').map(function(file) {
process.env.NODE_ENV = ~fs.readdirSync('./server/config/env').map(function(file) {
return file.slice(0, -3);
}).indexOf(process.env.NODE_ENV) ? process.env.NODE_ENV : 'development';

Expand Down

0 comments on commit 5df3a05

Please sign in to comment.