jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix user to match adminEmail

Browse Source
This commit is contained in:
Girish Ramakrishnan
2016-05-07 01:18:40 -07:00
parent a8e458e935
commit bc78f4a6d8
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/addons.js
View File

@@ -401,7 +401,7 @@ function setupSendMail(app, options, callback) {
assert.strictEqual(typeof options, 'object'); assert.strictEqual(typeof options, 'object');
assert.strictEqual(typeof callback, 'function'); assert.strictEqual(typeof callback, 'function');
var from = app.location ? app.location + '-app' : app.manifest.title.replace(/[^a-zA-Z0-9]/, ''); // use no-reply for bare domains var from = (app.location ? app.location : app.manifest.title.replace(/[^a-zA-Z0-9]/, '')) + '-app';
var env = [ var env = [
'MAIL_SMTP_SERVER=mail', 'MAIL_SMTP_SERVER=mail',

3
src/mailer.js
View File

@@ -160,9 +160,8 @@ function sendMails(queue) {
var transport = nodemailer.createTransport(smtpTransport({ var transport = nodemailer.createTransport(smtpTransport({
host: mailServerIp, host: mailServerIp,
port: 2500, // this value comes from mail container port: 2500, // this value comes from mail container
requireTLS: true, // STARTTLS
auth: { auth: {
user: 'webadmin', user: 'no-reply', // derive from adminEmail
pass: 'supersecret' pass: 'supersecret'
}, },
tls: { tls: {