Merge pull request #420 from terakilobyte/staging

Delete newrelic.js file. Move static routes to bottom of express configu...
remotes/upstream/master
Quincy Larson 2015-05-05 10:17:15 -07:00
commit 1d5392e5c1
2 changed files with 3 additions and 26 deletions

5
app.js
View File

@ -86,8 +86,6 @@ if (process.env.NODE_ENV === 'production') {
app.use(compress());
app.use(lessMiddleware(__dirname + '/public'));
app.use(express.static(__dirname + '/public', {maxAge: 86400000 }));
app.use("/template", express.static(__dirname + "/public/bower_components/angular-ui-bootstrap/template"));
app.use(logger('dev'));
app.use(bodyParser.json());
app.use(bodyParser.urlencoded({extended: true}));
@ -227,6 +225,9 @@ app.use(function (req, res, next) {
req.session.returnTo = req.path;
next();
});
app.use(express.static(__dirname + '/public', {maxAge: 86400000 }));
app.use('/template', express.static(__dirname +
'/public/bower_components/angular-ui-bootstrap/template'));
/**
* Main routes.

View File

@ -1,24 +0,0 @@
/**
* New Relic agent configuration.
*
* See lib/config.defaults.js in the agent distribution for a more complete
* description of configuration variables and their potential values.
*/
exports.config = {
/**
* Array of application names.
*/
app_name : ['freecodecamp'],
/**
* Your New Relic license key.
*/
license_key : '4b88e7cef87e9e99728be2d36c4d5f2a3862f5ae',
logging : {
/**
* Level at which to log. 'trace' is most useful to New Relic when diagnosing
* issues with the agent, 'info' and higher will impose the least overhead on
* production applications.
*/
level : 'info'
}
};