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

mail: remove config.fqdn use

Browse Source
This commit is contained in:
Girish Ramakrishnan
2018-01-24 11:33:09 -08:00
parent efc6a5acd0
commit 4e267c7cd1
3 changed files with 98 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/mailer.js
View File

@@ -31,8 +31,8 @@ var assert = require('assert'),
config = require('./config.js'),
debug = require('debug')('box:mailer'),
docker = require('./docker.js').connection,
domains = require('./domains.js'),
ejs = require('ejs'),
mail = require('./mail.js'),
nodemailer = require('nodemailer'),
path = require('path'),
safe = require('safetydance'),
@@ -74,15 +74,17 @@ function getMailConfig(callback) {
cloudronName = 'Cloudron';
}
domains.getAll(function (error, domains) {
mail.getAll(function (error, domains) {
if (error) return callback(error);
if (domains.length === 0) return callback('No domains configured');
const defaultDomain = domains[0];
callback(null, {
adminEmails: adminEmails,
cloudronName: cloudronName,
notificationDomain: domains[0].domain,
notificationFrom: '"' + cloudronName + '" <no-reply@' + domains[0].domain + '>'
notificationDomain: defaultDomain.domain,
notificationFrom: '"' + cloudronName + '" <no-reply@' + defaultDomain.domain + '>'
});
});
});