beenull/tellform
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/whitef0x0/tellform into stage

Browse source
This commit is contained in:
David Baldwynn 2017-03-30 12:01:39 -07:00
parent 9b8b7ff4a2 c08daea2cc
commit bf408586e5
No known key found for this signature in database
GPG key ID: 15D1C13202224A9B
3 changed files with 30 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
app.json
View file

@ -1,31 +1,28 @@
{
"name": "TellForm",
"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"],
"name": "TellForm",
"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"],
"addons": ["mongolab", "sparkpost"],
"env": {
"IS_HEROKU_INSTALLATION": {
"value": "TRUE"
"DISABLE_CLUSTER_MODE": {
"description": "Disable support for running in cluster mode on pm2",
"value": "TRUE"
},
"SUBDOMAINS_DISABLED": {
"description": "Disable subdomains for user forms",
"value": "TRUE"
"NODE_ENV": {
"description": "Choose whether to run app in development or production mode",
"value": "production"
},
"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",
"required": true
"description": "The url of your heroku app."
},
"SOCKET_URL": {
"description": "Where you websockets will connect to (i.e. your heroku app url)"
},
"MAILER_SERVICE_PROVIDER": {
"description": "Which mailer provider are you using? (i.e. SparkPost, Mandrill, etc)",
"value": "Sparkpost",
"required": true
"description": "Which mail service/API you will be using (i.e. SparkPost, Mandrill, etc)",
"value": "Sparkpost"
}
}
}

10
config/env/production.js vendored
View file

@ -7,6 +7,7 @@ module.exports = {
},
port: process.env.PORT || 5000,
socketUrl: process.env.SOCKET_URL || 'ws.tellform.com',
socketPort: process.env.SOCKET_PORT || null,
log: {
// Can specify one of 'combined', 'common', 'dev', 'short', 'tiny'
format: 'combined',
@ -51,6 +52,7 @@ module.exports = {
callbackURL: '/auth/github/callback'
},
mailer: {
<<<<<<< HEAD
from: process.env.MAILER_FROM || 'testing@' + process.env.SPARKPOST_SANDBOX_DOMAIN || 'no-reply@tellform.com',
options: {
service: process.env.MAILER_SERVICE_PROVIDER || '',
@ -61,6 +63,14 @@ module.exports = {
auth: {
user: process.env.SPARKPOST_SMTP_USERNAME || process.env.MAILER_EMAIL_ID || '',
pass: process.env.SPARKPOST_SMTP_PASSWORD || process.env.MAILER_PASSWORD || ''
=======
from: process.env.MAILER_FROM || 'testing@'+process.env.SPARKPOST_SANDBOX_DOMAIN || 'no-reply@tellform.com',
options: {
service: process.env.MAILER_SERVICE_PROVIDER || '',
auth: {
user: process.env.MAILER_EMAIL_ID || process.env.SPARKPOST_SMTP_USERNAME || '',
pass: process.env.MAILER_PASSWORD || process.env.SPARKPOST_SMTP_PASSWORD || ''
>>>>>>> c08daea2ccfe85231755dc239fa1aff0ee8f5029
}
}
}

3
config/socket.io.js
View file

@ -11,7 +11,8 @@ 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.DISABLE_CLUSTER_MODE === "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 }));
}