From 1a73b4c1c79f967490ee4bd1ea351de4e98e737a Mon Sep 17 00:00:00 2001 From: David Baldwynn Date: Thu, 30 Mar 2017 09:46:36 -0700 Subject: [PATCH 01/32] Updated app.json env variables --- app.json | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/app.json b/app.json index 4f0a5ef4..d50a850a 100644 --- a/app.json +++ b/app.json @@ -3,5 +3,19 @@ "description": "Beautiful, opensource web forms", "repository": "https://github.com/whitef0x0/tellform", "logo": "https://node-js-sample.herokuapp.com/node.svg", - "keywords": ["node", "express", "static", "mean"] + "keywords": ["node", "express", "static", "mean"], + "env": { + "SUBDOMAINS_DISABLED": { + "description": "Disable subdomains for user forms", + "value": "TRUE" + }, + "NODE_ENV": { + "description": "Specify whether to run development or production version of the app", + "value": "production", + "required": true + } + }, + "scripts": { + "predeploy": "grunt build" + } } From 05acf4819cd423d6ea388d386dfa066f48b84936 Mon Sep 17 00:00:00 2001 From: David Baldwynn Date: Thu, 30 Mar 2017 09:48:37 -0700 Subject: [PATCH 02/32] Added BASE_URL env to app.json --- app.json | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/app.json b/app.json index d50a850a..d15c68a1 100644 --- a/app.json +++ b/app.json @@ -6,13 +6,17 @@ "keywords": ["node", "express", "static", "mean"], "env": { "SUBDOMAINS_DISABLED": { - "description": "Disable subdomains for user forms", - "value": "TRUE" + "description": "Disable subdomains for user forms", + "value": "TRUE" }, "NODE_ENV": { "description": "Specify whether to run development or production version of the app", "value": "production", "required": true + }, + "BASE_URL": { + "description": "Set this to your heroku app's URL", + "required": true } }, "scripts": { From 960f5a252bd2ebaf99fb8a833d158248e62e47ee Mon Sep 17 00:00:00 2001 From: David Baldwynn Date: Thu, 30 Mar 2017 09:55:39 -0700 Subject: [PATCH 03/32] Added glob to main dependencies --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a434fb6c..9276f096 100644 --- a/package.json +++ b/package.json @@ -23,6 +23,7 @@ "init": "node scripts/setup.js" }, "dependencies": { + "glob": "^7.0.3", "async": "^1.4.2", "async-boolean-expression-evaluator": "^1.1.1", "bcrypt": "^0.8.7", @@ -97,7 +98,6 @@ "coveralls": "^2.11.4", "cross-spawn": "^5.0.0", "del": "^2.2.2", - "glob": "^7.0.3", "grunt-execute": "^0.2.2", "grunt-mocha-istanbul": "^3.0.1", "grunt-mocha-test": "~0.12.1", From ba69eb72c608d4097b33a99cde44f221ec26c59f Mon Sep 17 00:00:00 2001 From: David Baldwynn Date: Thu, 30 Mar 2017 10:01:06 -0700 Subject: [PATCH 04/32] Added DISABLED_SUBDOMAINS to setup script --- scripts/setup.js | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/scripts/setup.js b/scripts/setup.js index 7a9b9c30..43abff5f 100644 --- a/scripts/setup.js +++ b/scripts/setup.js @@ -70,6 +70,11 @@ var nodemailer_providers = [ 'Zoho' ]; +var bool_options = [ + "TRUE", + "FALSE" +] + var questions = [ { type: 'confirm', @@ -97,6 +102,12 @@ var questions = [ message: 'Do you want to disable signups?', default: false }, + { + type: 'list', + name: 'SUBDOMAINS_DISABLED', + message: 'Do you want to have subdomains? (i.e. are you using a custom domain)', + choices: bool_options + }, { type: 'list', name: 'MAILER_SERVICE_PROVIDER', From 436d192ca57f72e6aab9fa6e4937f7d329abb92b Mon Sep 17 00:00:00 2001 From: David Baldwynn Date: Thu, 30 Mar 2017 10:03:17 -0700 Subject: [PATCH 05/32] Fixed mailer env for production config --- config/env/production.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/env/production.js b/config/env/production.js index f89e2bd9..662ebc95 100755 --- a/config/env/production.js +++ b/config/env/production.js @@ -54,10 +54,10 @@ module.exports = { from: process.env.MAILER_FROM || 'no-reply@tellform.com', options: { service: process.env.MAILER_SERVICE_PROVIDER || '', - ssl: false, + /*ssl: false, host: 'smtp.sparkpostmail.com', port: 587, - secure: false, + secure: false,*/ auth: { user: process.env.MAILER_EMAIL_ID || '', pass: process.env.MAILER_PASSWORD || '' From 408093125a12fafee4cf8e132aacc74b335cdd41 Mon Sep 17 00:00:00 2001 From: David Baldwynn Date: Thu, 30 Mar 2017 10:05:08 -0700 Subject: [PATCH 06/32] Added mailer env variables --- app.json | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/app.json b/app.json index d15c68a1..f5f3a67e 100644 --- a/app.json +++ b/app.json @@ -17,6 +17,18 @@ "BASE_URL": { "description": "Set this to your heroku app's URL", "required": true + }, + "MAILER_SERVICE_PROVIDER": { + "description": "Which mailer provider are you using? (i.e. SparkPost, Mandrill, etc)", + "required": false + }, + "MAILER_EMAIL_ID": { + "description": "Your mail provider account login", + "required": false + }, + "MAILER_PASSWORD": { + "description": "Your mail provider account password or API key", + "required": false } }, "scripts": { From d76f6562387d89c69beb403acc9a6832a9cddbb7 Mon Sep 17 00:00:00 2001 From: David Baldwynn Date: Thu, 30 Mar 2017 10:06:50 -0700 Subject: [PATCH 07/32] Added multer to dependencies --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 9276f096..b86e96bb 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,8 @@ "init": "node scripts/setup.js" }, "dependencies": { - "glob": "^7.0.3", + "multer": "^1.3.0", + "glob": "^7.0.3", "async": "^1.4.2", "async-boolean-expression-evaluator": "^1.1.1", "bcrypt": "^0.8.7", From f1c43f152a0648b93bf03299f0a326c93ac5f5ae Mon Sep 17 00:00:00 2001 From: David Baldwynn Date: Thu, 30 Mar 2017 10:11:18 -0700 Subject: [PATCH 08/32] Fixed bower resolutions --- bower.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/bower.json b/bower.json index 0c451253..0841501b 100755 --- a/bower.json +++ b/bower.json @@ -46,8 +46,9 @@ }, "resolutions": { "angular-bootstrap": "^0.14.0", - "angular": "1.4.12", - "angular-ui-select": "compiled" + "angular": "1.4.14", + "angular-ui-select": "compiled", + "jspdf": "~1.0.178" }, "overrides": { "BOWER-PACKAGE": { From 43e277181bf887c466603ab5811e2be5813264c2 Mon Sep 17 00:00:00 2001 From: David Baldwynn Date: Thu, 30 Mar 2017 10:13:38 -0700 Subject: [PATCH 09/32] Disabled redis if it is a heroku installation --- config/socket.io.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/config/socket.io.js b/config/socket.io.js index 4ea8a6b1..3b944b65 100644 --- a/config/socket.io.js +++ b/config/socket.io.js @@ -11,9 +11,10 @@ module.exports = function (app, db) { var server = http.createServer(app); var io = socketio(config.socketPort, { transports: ['websocket', 'polling'] }); - var redis = require('socket.io-redis'); - io.adapter(redis( process.env.REDIS_URL || { host: process.env.REDIS_DB_PORT_6379_TCP_ADDR || '127.0.0.1' , port: process.env.REDIS_DB_PORT_6379_TCP_PORT || 6379 })); - + if(process.env.IS_HEROKU_INSTALLATION == "TRUE"){ + var redis = require('socket.io-redis'); + io.adapter(redis( process.env.REDIS_URL || { host: process.env.REDIS_DB_PORT_6379_TCP_ADDR || '127.0.0.1' , port: process.env.REDIS_DB_PORT_6379_TCP_PORT || 6379 })); + } // Add an event listener to the 'connection' event io.on('connection', function (socket) { config.getGlobbedFiles('./app/sockets/**.js').forEach(function (socketConfiguration) { From bccb9621c8a69ec25415c1c08254527e79cbf1dc Mon Sep 17 00:00:00 2001 From: David Baldwynn Date: Thu, 30 Mar 2017 10:14:52 -0700 Subject: [PATCH 10/32] Added IS_HEROKU_INSTALLATION env to app.json --- app.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app.json b/app.json index f5f3a67e..e9df3d89 100644 --- a/app.json +++ b/app.json @@ -5,6 +5,11 @@ "logo": "https://node-js-sample.herokuapp.com/node.svg", "keywords": ["node", "express", "static", "mean"], "env": { + "IS_HEROKU_INSTALLATION": { + "description": "Disables redis if it is a heroku installation (i.e. if it doesn't need to run in cluster mode)", + "value": "TRUE", + "required": true + }, "SUBDOMAINS_DISABLED": { "description": "Disable subdomains for user forms", "value": "TRUE" From 5fcffd5ea83a72a7579e40976bc112ff93faf125 Mon Sep 17 00:00:00 2001 From: David Baldwynn Date: Thu, 30 Mar 2017 10:21:08 -0700 Subject: [PATCH 11/32] Fixed redis heroku installation bug --- config/socket.io.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/socket.io.js b/config/socket.io.js index 3b944b65..c604316b 100644 --- a/config/socket.io.js +++ b/config/socket.io.js @@ -11,7 +11,7 @@ module.exports = function (app, db) { var server = http.createServer(app); var io = socketio(config.socketPort, { transports: ['websocket', 'polling'] }); - if(process.env.IS_HEROKU_INSTALLATION == "TRUE"){ + if(process.env.IS_HEROKU_INSTALLATION !== "TRUE"){ var redis = require('socket.io-redis'); io.adapter(redis( process.env.REDIS_URL || { host: process.env.REDIS_DB_PORT_6379_TCP_ADDR || '127.0.0.1' , port: process.env.REDIS_DB_PORT_6379_TCP_PORT || 6379 })); } From 4169e18e73d6271e42227f42850feea51e338264 Mon Sep 17 00:00:00 2001 From: David Baldwynn Date: Thu, 30 Mar 2017 10:24:23 -0700 Subject: [PATCH 12/32] Update app.json --- app.json | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/app.json b/app.json index e9df3d89..2b5922c9 100644 --- a/app.json +++ b/app.json @@ -3,6 +3,7 @@ "description": "Beautiful, opensource web forms", "repository": "https://github.com/whitef0x0/tellform", "logo": "https://node-js-sample.herokuapp.com/node.svg", + "addons": ["mongolab", "sparkpost"], "keywords": ["node", "express", "static", "mean"], "env": { "IS_HEROKU_INSTALLATION": { @@ -25,15 +26,8 @@ }, "MAILER_SERVICE_PROVIDER": { "description": "Which mailer provider are you using? (i.e. SparkPost, Mandrill, etc)", - "required": false - }, - "MAILER_EMAIL_ID": { - "description": "Your mail provider account login", - "required": false - }, - "MAILER_PASSWORD": { - "description": "Your mail provider account password or API key", - "required": false + "value": "SparkPost", + "required": true } }, "scripts": { From 2651d1a7b89ed6e85c75e38214a1a266ce1b5b4d Mon Sep 17 00:00:00 2001 From: David Baldwynn Date: Thu, 30 Mar 2017 10:25:20 -0700 Subject: [PATCH 13/32] Added SparkPost addon env variables for heroku installation --- config/env/production.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/env/production.js b/config/env/production.js index 662ebc95..41320707 100755 --- a/config/env/production.js +++ b/config/env/production.js @@ -59,8 +59,8 @@ module.exports = { port: 587, secure: false,*/ auth: { - user: process.env.MAILER_EMAIL_ID || '', - pass: process.env.MAILER_PASSWORD || '' + user: process.env.SPARKPOST_SMTP_USERNAME || process.env.MAILER_EMAIL_ID || '', + pass: process.env.SPARKPOST_SMTP_PASSWORD || process.env.MAILER_PASSWORD || '' } } } From ca6fc064cecaa38e1befb1d139f775a4598b11c1 Mon Sep 17 00:00:00 2001 From: David Baldwynn Date: Thu, 30 Mar 2017 10:29:04 -0700 Subject: [PATCH 14/32] Added SparkPost sandbox domain --- config/env/production.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/env/production.js b/config/env/production.js index 41320707..ae9848d6 100755 --- a/config/env/production.js +++ b/config/env/production.js @@ -51,7 +51,7 @@ module.exports = { callbackURL: '/auth/github/callback' }, mailer: { - from: process.env.MAILER_FROM || 'no-reply@tellform.com', + from: process.env.MAILER_FROM || 'testing@' + process.env.SPARKPOST_SANDBOX_DOMAIN || 'no-reply@tellform.com', options: { service: process.env.MAILER_SERVICE_PROVIDER || '', /*ssl: false, From 5279016eff594506cd1daa678b9a0715d891fc94 Mon Sep 17 00:00:00 2001 From: David Baldwynn Date: Thu, 30 Mar 2017 10:31:15 -0700 Subject: [PATCH 15/32] Fixed MAILER_SERVICE_PROVIDER default value --- app.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app.json b/app.json index 2b5922c9..d2f23dbc 100644 --- a/app.json +++ b/app.json @@ -26,7 +26,7 @@ }, "MAILER_SERVICE_PROVIDER": { "description": "Which mailer provider are you using? (i.e. SparkPost, Mandrill, etc)", - "value": "SparkPost", + "value": "Sparkpost", "required": true } }, From 50379fa866adeca2e618c7fa839f46c72ac52f2e Mon Sep 17 00:00:00 2001 From: David Baldwynn Date: Thu, 30 Mar 2017 10:36:30 -0700 Subject: [PATCH 16/32] Added heroku admin creation script --- scripts/create_admin.js | 50 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 scripts/create_admin.js diff --git a/scripts/create_admin.js b/scripts/create_admin.js new file mode 100644 index 00000000..f139008e --- /dev/null +++ b/scripts/create_admin.js @@ -0,0 +1,50 @@ +var init = require('../config/init')(), + config = require('../config/config'), + mongoose = require('mongoose'), + chalk = require('chalk'), + fs = require('fs-extra'); + +// Bootstrap db connection +var db = mongoose.connect(config.db.uri, config.db.options, function(err) { + if (err) { + console.error(chalk.red('Could not connect to MongoDB!')); + console.log(chalk.red(err)); + } +}); +mongoose.connection.on('error', function(err) { + console.error(chalk.red('MongoDB connection error: ' + err)); + process.exit(-1); +}); + +// Init the express application +var app = require('../config/express')(db); + +// Bootstrap passport config +require('../config/passport')(); + +var User = mongoose.model('User'); +require('../app/models/user.server.model.js'); + +var email = process.env.ADMIN_EMAIL; +var username = process.env.ADMIN_USERNAME; +var password = process.env.ADMIN_PASSWORD; + +user = new User({ + firstName: 'Admin', + lastName: 'Account', + email: email, + username: username, + password: password, + provider: 'local', + roles: ['admin', 'user'] +}); + +user.save(function (err) { + if (err) return console.error(chalk.red(err)); + console.log(chalk.green('Successfully created user')); + delete email; + delete password; + delete username; + + process.exit(1); +}); From 18bb453c507649dc99413f672dad7ceabc139ac9 Mon Sep 17 00:00:00 2001 From: David Baldwynn Date: Thu, 30 Mar 2017 10:37:45 -0700 Subject: [PATCH 17/32] Updated mongolab env variables --- config/env/production.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/env/production.js b/config/env/production.js index ae9848d6..443de8ad 100755 --- a/config/env/production.js +++ b/config/env/production.js @@ -3,7 +3,7 @@ module.exports = { baseUrl: process.env.BASE_URL || 'tellform.com', db: { - uri: process.env.MONGOHQ_URL || process.env.MONGOLAB_URI || 'mongodb://' + (process.env.DB_1_PORT_27017_TCP_ADDR || 'localhost') + '/mean', + uri: process.env.MONGODB_URI || process.env.MONGOHQ_URL || process.env.MONGOLAB_URI || 'mongodb://' + (process.env.DB_1_PORT_27017_TCP_ADDR || 'localhost') + '/mean', }, port: process.env.PORT || 5000, socketUrl: process.env.SOCKET_URL || 'ws.tellform.com', From 7dbccb9bd5b35b0b9c1e82fdebea7d483342b29f Mon Sep 17 00:00:00 2001 From: David Baldwynn Date: Thu, 30 Mar 2017 10:42:26 -0700 Subject: [PATCH 18/32] Added create admin script to app.json --- app.json | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/app.json b/app.json index d2f23dbc..92ba1435 100644 --- a/app.json +++ b/app.json @@ -28,9 +28,21 @@ "description": "Which mailer provider are you using? (i.e. SparkPost, Mandrill, etc)", "value": "Sparkpost", "required": true - } + }, + "ADMIN_EMAIL": { + "description": "Email of the default admin account", + "required": true + }, + "ADMIN_USERNAME": { + "description": "Username of the default admin account", + "required": true + }, + "ADMIN_USERNAME": { + "description": "Password of the default admin account", + "required": true + }, }, "scripts": { - "predeploy": "grunt build" + "predeploy": "grunt build; node scripts/create-admin.js", } } From 1a4e445f4a011b217b06f7671f1a9f3e26ed8ccd Mon Sep 17 00:00:00 2001 From: David Baldwynn Date: Thu, 30 Mar 2017 10:43:06 -0700 Subject: [PATCH 19/32] Update create_admin.js --- scripts/create_admin.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/create_admin.js b/scripts/create_admin.js index f139008e..2f363269 100644 --- a/scripts/create_admin.js +++ b/scripts/create_admin.js @@ -1,7 +1,7 @@ var init = require('../config/init')(), config = require('../config/config'), mongoose = require('mongoose'), - chalk = require('chalk'), + chalk = require('chalk'), fs = require('fs-extra'); // Bootstrap db connection From a36066d7105ad16386cb74f960d378514d8f0585 Mon Sep 17 00:00:00 2001 From: David Baldwynn Date: Thu, 30 Mar 2017 10:44:11 -0700 Subject: [PATCH 20/32] Fixed app.json template errors --- app.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app.json b/app.json index 92ba1435..3950f440 100644 --- a/app.json +++ b/app.json @@ -40,7 +40,7 @@ "ADMIN_USERNAME": { "description": "Password of the default admin account", "required": true - }, + } }, "scripts": { "predeploy": "grunt build; node scripts/create-admin.js", From 138ad4eac8f84d780d98f461e1a8562c14965193 Mon Sep 17 00:00:00 2001 From: David Baldwynn Date: Thu, 30 Mar 2017 10:45:13 -0700 Subject: [PATCH 21/32] Update --- app.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app.json b/app.json index 3950f440..329b9126 100644 --- a/app.json +++ b/app.json @@ -37,7 +37,7 @@ "description": "Username of the default admin account", "required": true }, - "ADMIN_USERNAME": { + "ADMIN_PASSWORD": { "description": "Password of the default admin account", "required": true } From c0ef89b19bef3b91e03c7d6a30700dd6e29b1174 Mon Sep 17 00:00:00 2001 From: David Baldwynn Date: Thu, 30 Mar 2017 10:47:25 -0700 Subject: [PATCH 22/32] Fixed json schema --- app.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app.json b/app.json index 329b9126..61e14e34 100644 --- a/app.json +++ b/app.json @@ -43,6 +43,6 @@ } }, "scripts": { - "predeploy": "grunt build; node scripts/create-admin.js", + "predeploy": "grunt build; node scripts/create-admin.js" } } From 5317edabfd1d12c48daacffc45a1a9797e7b56de Mon Sep 17 00:00:00 2001 From: David Baldwynn Date: Thu, 30 Mar 2017 10:53:03 -0700 Subject: [PATCH 23/32] Moved create-admin script to post deploy --- app.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app.json b/app.json index 61e14e34..d9e6d19d 100644 --- a/app.json +++ b/app.json @@ -43,6 +43,7 @@ } }, "scripts": { - "predeploy": "grunt build; node scripts/create-admin.js" + "predeploy": "grunt build", + "postdeploy": "node /app/scripts/create-admin.js" } } From e407cf25faeed2f154d39aedbe6b0a141fa8696d Mon Sep 17 00:00:00 2001 From: David Baldwynn Date: Thu, 30 Mar 2017 10:55:19 -0700 Subject: [PATCH 24/32] Added dyno-metadata addon --- app.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app.json b/app.json index d9e6d19d..1da8ef50 100644 --- a/app.json +++ b/app.json @@ -3,7 +3,7 @@ "description": "Beautiful, opensource web forms", "repository": "https://github.com/whitef0x0/tellform", "logo": "https://node-js-sample.herokuapp.com/node.svg", - "addons": ["mongolab", "sparkpost"], + "addons": ["mongolab", "sparkpost", "runtime-dyno-metadata "], "keywords": ["node", "express", "static", "mean"], "env": { "IS_HEROKU_INSTALLATION": { From 47c929467a8db638c5b0d932ce98da1893f70578 Mon Sep 17 00:00:00 2001 From: David Baldwynn Date: Thu, 30 Mar 2017 10:56:37 -0700 Subject: [PATCH 25/32] Added HEROKU_APP_NAME env to baseUrl config parameter --- config/env/production.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/env/production.js b/config/env/production.js index 443de8ad..1de0be53 100755 --- a/config/env/production.js +++ b/config/env/production.js @@ -1,7 +1,7 @@ 'use strict'; module.exports = { - baseUrl: process.env.BASE_URL || 'tellform.com', + baseUrl: process.env.BASE_URL || process.env.HEROKU_APP_NAME + '.herokuapp.com' || 'tellform.com', db: { uri: process.env.MONGODB_URI || process.env.MONGOHQ_URL || process.env.MONGOLAB_URI || 'mongodb://' + (process.env.DB_1_PORT_27017_TCP_ADDR || 'localhost') + '/mean', }, From 9891187c7b97c7f2163c2071c5652385f7c84f91 Mon Sep 17 00:00:00 2001 From: David Baldwynn Date: Thu, 30 Mar 2017 10:59:49 -0700 Subject: [PATCH 26/32] Fixed addon not found --- app.json | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/app.json b/app.json index 1da8ef50..8e620c29 100644 --- a/app.json +++ b/app.json @@ -3,13 +3,11 @@ "description": "Beautiful, opensource web forms", "repository": "https://github.com/whitef0x0/tellform", "logo": "https://node-js-sample.herokuapp.com/node.svg", - "addons": ["mongolab", "sparkpost", "runtime-dyno-metadata "], + "addons": ["mongolab", "sparkpost"], "keywords": ["node", "express", "static", "mean"], "env": { "IS_HEROKU_INSTALLATION": { - "description": "Disables redis if it is a heroku installation (i.e. if it doesn't need to run in cluster mode)", "value": "TRUE", - "required": true }, "SUBDOMAINS_DISABLED": { "description": "Disable subdomains for user forms", @@ -40,7 +38,10 @@ "ADMIN_PASSWORD": { "description": "Password of the default admin account", "required": true - } + }, + "HEROKU_APP_NAME": { + "required": true + }, }, "scripts": { "predeploy": "grunt build", From b3131dfaacab500557c2dd6022593ad03adbe845 Mon Sep 17 00:00:00 2001 From: David Baldwynn Date: Thu, 30 Mar 2017 11:00:07 -0700 Subject: [PATCH 27/32] Fixed json error in app.json --- app.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app.json b/app.json index 8e620c29..470cc338 100644 --- a/app.json +++ b/app.json @@ -41,7 +41,7 @@ }, "HEROKU_APP_NAME": { "required": true - }, + } }, "scripts": { "predeploy": "grunt build", From 0c551b5719e4b69417a1a0c478c28d95a64d73bd Mon Sep 17 00:00:00 2001 From: David Baldwynn Date: Thu, 30 Mar 2017 11:01:24 -0700 Subject: [PATCH 28/32] Fixed app.json error --- app.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app.json b/app.json index 470cc338..b09ae0f7 100644 --- a/app.json +++ b/app.json @@ -7,7 +7,7 @@ "keywords": ["node", "express", "static", "mean"], "env": { "IS_HEROKU_INSTALLATION": { - "value": "TRUE", + "value": "TRUE" }, "SUBDOMAINS_DISABLED": { "description": "Disable subdomains for user forms", From 6b3414382601d88bd937054a64eeff72ad1059a1 Mon Sep 17 00:00:00 2001 From: David Baldwynn Date: Thu, 30 Mar 2017 11:01:50 -0700 Subject: [PATCH 29/32] Update app.json --- app.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/app.json b/app.json index b09ae0f7..713b5992 100644 --- a/app.json +++ b/app.json @@ -18,10 +18,6 @@ "value": "production", "required": true }, - "BASE_URL": { - "description": "Set this to your heroku app's URL", - "required": true - }, "MAILER_SERVICE_PROVIDER": { "description": "Which mailer provider are you using? (i.e. SparkPost, Mandrill, etc)", "value": "Sparkpost", From 218eb65e1f57f734cd9cdcd55951e8ee11d9807e Mon Sep 17 00:00:00 2001 From: David Baldwynn Date: Thu, 30 Mar 2017 11:02:53 -0700 Subject: [PATCH 30/32] Readded BASE_URL to app.json --- app.json | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app.json b/app.json index 713b5992..d03c9a80 100644 --- a/app.json +++ b/app.json @@ -13,6 +13,10 @@ "description": "Disable subdomains for user forms", "value": "TRUE" }, + "BASE_URL": { + "description": "Set this to your heroku app's URL", + "required": true + }, "NODE_ENV": { "description": "Specify whether to run development or production version of the app", "value": "production", @@ -34,9 +38,6 @@ "ADMIN_PASSWORD": { "description": "Password of the default admin account", "required": true - }, - "HEROKU_APP_NAME": { - "required": true } }, "scripts": { From d596ad50519a4dc3584b3aa17abe6d8258831c20 Mon Sep 17 00:00:00 2001 From: David Baldwynn Date: Thu, 30 Mar 2017 11:07:58 -0700 Subject: [PATCH 31/32] Update app.json --- app.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app.json b/app.json index d03c9a80..54eab3f7 100644 --- a/app.json +++ b/app.json @@ -42,6 +42,6 @@ }, "scripts": { "predeploy": "grunt build", - "postdeploy": "node /app/scripts/create-admin.js" + "postdeploy": "node scripts/create-admin.js" } } From 68f3c64ccb21585f127214040bd53f656c026438 Mon Sep 17 00:00:00 2001 From: David Baldwynn Date: Thu, 30 Mar 2017 11:13:06 -0700 Subject: [PATCH 32/32] Fixed postdeploy script name. --- app.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app.json b/app.json index 54eab3f7..b0e60fbc 100644 --- a/app.json +++ b/app.json @@ -42,6 +42,6 @@ }, "scripts": { "predeploy": "grunt build", - "postdeploy": "node scripts/create-admin.js" + "postdeploy": "node scripts/create_admin.js" } }