|
|
@@ -24,19 +24,23 @@ module.exports = function(crowi) {
|
|
|
option = {
|
|
|
host: config.crowi['mail:smtpHost'],
|
|
|
port: config.crowi['mail:smtpPort'],
|
|
|
- auth: {
|
|
|
+ };
|
|
|
+
|
|
|
+ if (config.crowi['mail:smtpUser'] && config.crowi['mail:smtpPassword']) {
|
|
|
+ option.auth = {
|
|
|
user: config.crowi['mail:smtpUser'],
|
|
|
pass: config.crowi['mail:smtpPassword']
|
|
|
- }
|
|
|
- };
|
|
|
+ };
|
|
|
+ }
|
|
|
if (option.port === 465) {
|
|
|
option.secure = true;
|
|
|
}
|
|
|
}
|
|
|
+ option.tls = {rejectUnauthorized: false};
|
|
|
|
|
|
client = nodemailer.createTransport(option);
|
|
|
|
|
|
- debug('mailer setted up for SMTP', client);
|
|
|
+ debug('mailer set up for SMTP', client);
|
|
|
return client;
|
|
|
}
|
|
|
|
|
|
@@ -54,7 +58,7 @@ module.exports = function(crowi) {
|
|
|
var ses = require('nodemailer-ses-transport');
|
|
|
client = nodemailer.createTransport(ses(option));
|
|
|
|
|
|
- debug('mailer setted up for SES', client);
|
|
|
+ debug('mailer set up for SES', client);
|
|
|
return client;
|
|
|
}
|
|
|
|