Skip to content
This repository has been archived by the owner on Oct 9, 2019. It is now read-only.

WIP: fix heroku deployment #339

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ NODE_ENV=development
# Set to a randomly generated 16 bytes string
SECRET_KEY=ChangeMeChangeMe

# URI of Mongo database that TellForm will connect to
# URI of Mongo database that TellForm will connect to
#DO NOT CHANGE
MONGODB_URI=mongodb://mongo/tellform

Expand Down Expand Up @@ -121,4 +121,4 @@ APP_NAME=
APP_KEYWORDS=

# Set this to set the 'description' meta property in the HTML head
APP_DESC=
APP_DESC=
1 change: 0 additions & 1 deletion Procfile

This file was deleted.

5 changes: 3 additions & 2 deletions app.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"addons": ["mongolab", "sendgrid", "heroku-redis"],
"env": {
"SUBDOMAINS_DISABLED": {
"description": "Disable support for running subdomains. (This should be true if you are not using your own custom domain.",
"description": "Disable support for running subdomains. (This should be true if you are not using your own custom domain.)",
"value": "TRUE"
},
"ENABLE_CLUSTER_MODE": {
Expand All @@ -19,7 +19,8 @@
"value": "production"
},
"BASE_URL": {
"description": "The url of your heroku app."
"description": "The url of your heroku app.",
"required": false
},
"SOCKET_URL": {
"description": "Where you websockets will connect to (i.e. your heroku app url)"
Expand Down
3 changes: 2 additions & 1 deletion gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -334,13 +334,14 @@ module.exports = function(grunt) {

// Debug task.
grunt.registerTask('debug', ['lint', 'html2js:main', 'html2js:forms', 'concurrent:debug']);

// Lint task(s).
grunt.registerTask('lint', ['jshint', 'csslint', 'i18nlint:client', 'i18nlint:server']);
grunt.registerTask('lint:tests', ['jshint:allTests']);

// Build task(s).
grunt.registerTask('build', ['lint', 'loadConfig', 'cssmin', 'ngAnnotate', 'uglify', 'html2js:main', 'html2js:forms']);
grunt.registerTask('build:prod', ['loadConfig', 'cssmin', 'uglify', 'html2js:main', 'html2js:forms']);

//Setup task(s).
grunt.registerTask('setup', ['execute']);
Expand Down
Loading