Skip to content
This repository has been archived by the owner on Nov 7, 2023. It is now read-only.

Commit

Permalink
🖕
Browse files Browse the repository at this point in the history
  • Loading branch information
jacob-meacham committed Nov 20, 2016
1 parent 89f2145 commit e16b8d7
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 7 deletions.
3 changes: 2 additions & 1 deletion Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,8 @@ module.exports = function(grunt) {
ci: {
options: {
script: 'server.js',
debug: false
debug: false,
//node_env: 'ci'
}
}
},
Expand Down
6 changes: 6 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,9 @@ To run tests, run `grunt test`
Building
--------
Need to run `grunt build` before committing, to generate css (this is dumb)

NPM_CONFIG_PRODUCTION needs to be set to false (this is also dumb)

Future
------
* Just use docker, dummy
3 changes: 3 additions & 0 deletions app.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@
},
"VERSION": {
"required": true
},
"NPM_CONFIG_PRODUCTION": {
"required": true
}
},
"formation": {
Expand Down
5 changes: 2 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
"start": "node node_modules/.bin/grunt",
"test": "node node_modules/.bin/grunt test",
"postinstall": "node node_modules/.bin/bower install",
"heroku-prebuild": "npm install --dev",
"heroku-postbuild": "node node_modules/.bin/grunt heroku:production && npm prune --production"
},
"dependencies": {
Expand All @@ -30,8 +29,6 @@
"express-session": "1.11.3",
"express-validator": "2.17.1",
"forever": "0.15.1",
"grunt": "0.4.5",
"grunt-cli": "0.1.13",
"jade": "1.11.0",
"lodash": "2.4.1",
"method-override": "2.3.x",
Expand All @@ -56,6 +53,8 @@
"chai": "3.3.0",
"chai-as-promised": "5.1.0",
"coveralls": "2.11.4",
"grunt": "0.4.5",
"grunt-cli": "0.1.13",
"grunt-contrib-compass": "1.0.4",
"grunt-contrib-csslint": "0.5.0",
"grunt-contrib-cssmin": "0.14.0",
Expand Down
2 changes: 1 addition & 1 deletion server.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,4 @@ expressConfig.addErrorHandlers(app);
app.listen(config.app.port, config.app.hostname);
console.log('Acromaster started on ' + config.app.hostname + ':' + config.app.port + ' (' + env + ')');

exports = module.exports = app;
exports = module.exports = app;
4 changes: 2 additions & 2 deletions server/config/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ var config = {
app: {
name: 'Acromaster - Test',
port: process.env.PORT || 3000,
hostname: process.env.HOST || process.env.HOSTNAME,
hostname: undefined,
baseUrl: process.env.BASE_URL
},
session: {
Expand Down Expand Up @@ -90,4 +90,4 @@ _(['development', 'test', 'production']).forEach(function(env) {
};
});

module.exports = config;
module.exports = config;

0 comments on commit e16b8d7

Please sign in to comment.