fix(config): switch to new config style for emails, cc @lefnire

This commit is contained in:
Matteo Pagliazzi
2014-11-16 10:56:18 +01:00
parent f2ee452a33
commit 727c96e5da
2 changed files with 8 additions and 7 deletions
+5 -4
View File
@@ -20,9 +20,11 @@
"NEW_RELIC_APPLICATION_ID":"NEW_RELIC_APPLICATION_ID",
"NEW_RELIC_API_KEY":"NEW_RELIC_API_KEY",
"GA_ID": "GA_ID",
"EMAIL_SERVER_URL": "http://example.com",
"EMAIL_SERVER_AUTH_USER": "user",
"EMAIL_SERVER_AUTH_PASSWORD": "password",
"EMAIL_SERVER": {
"url": "http://example.com",
"authUser": "user",
"authPassword": "password"
},
"S3":{
"bucket":"bucket",
"accessKeyId":"accessKeyId",
@@ -33,5 +35,4 @@
"client_id":"client_id",
"client_secret":"client_secret"
}
}
+3 -3
View File
@@ -38,11 +38,11 @@ module.exports.txnEmail = function(mailingInfo, emailType, variables){
if (mailingInfo._id) mailingInfo = getMailingInfo(mailingInfo);
if (!mailingInfo.email) return;
request({
url: nconf.get('EMAIL_SERVER_URL') + '/job',
url: nconf.get('EMAIL_SERVER:url') + '/job',
method: 'POST',
auth: {
user: nconf.get('EMAIL_SERVER_AUTH_USER'),
pass: nconf.get('EMAIL_SERVER_AUTH_PASSWORD')
user: nconf.get('EMAIL_SERVER:authUser'),
pass: nconf.get('EMAIL_SERVER:authPassword')
},
json: {
type: 'email',