Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-09 23:45:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: removed invalid options for the sendmail transport (#8576)

Browse Source 
* Removed invalid options for the sendmail transport that were causing Nodemailer to return the SMTPTransport instead.

* Removed options for rate limiting in admin email interface. Added new option for toggling whether to use pooled connections.
This commit is contained in:
Kyle Farris
2020-08-26 10:46:59 -04:00
committed by GitHub
parent 6e805c1be7
commit 2b785628e7
4 changed files with 18 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/emailer.js
View File

@@ -25,9 +25,6 @@ Emailer.transports = {
sendmail: nodemailer.createTransport({
sendmail: true,
newline: 'unix',
pool: true,
rateLimit: meta.config['email:sendmail:rateLimit'],
rateDelta: meta.config['email:sendmail:rateDelta'],
}),
smtp: undefined,
};
@@ -66,7 +63,9 @@ Emailer.setupFallbackTransport = function (config) {
winston.verbose('[emailer] Setting up SMTP fallback transport');
// Enable Gmail transport if enabled in ACP
if (parseInt(config['email:smtpTransport:enabled'], 10) === 1) {
var smtpOptions = {};
var smtpOptions = {
pool: config['email:smtpTransport:pool'],
};
if (config['email:smtpTransport:user'] || config['email:smtpTransport:pass']) {
smtpOptions.auth = {

24
src/views/admin/settings/email.tpl
View File

@@ -18,19 +18,6 @@
</p>
<input type="text" class="form-control input-lg" id="email:from_name" data-field="email:from_name" placeholder="NodeBB" /><br />
</div>
<div class="row">
<div class="form-group col-sm-6">
<label for="email:sendmail:rateLimit">[[admin/settings/email:sendmail-rate-limit]]</label>
<input type="number" data-field="email:sendmail:rateLimit" id="email:sendmail:rateLimit" class="form-control" placeholder="2" />
</div>
<div class="form-group col-sm-6">
<label for="email:sendmail:rateDelta">[[admin/settings/email:sendmail-rate-delta]]</label>
<input type="number" data-field="email:sendmail:rateDelta" id="email:sendmail:rateDelta" class="form-control" placeholder="1000" />
</div>
<p class="col-xs-12 help-block">
[[admin/settings/email:sendmail-rate-help]]
</p>
</div>
</form>
</div>
</div>
@@ -50,6 +37,17 @@
<span class="mdl-switch__label">[[admin/settings/email:smtp-transport.enabled]]</span>
</label>
</div>
<div class="form-group">
<div class="checkbox">
<label for="email:smtpTransport:pool" class="mdl-switch mdl-js-switch mdl-js-ripple-effect">
<input class="mdl-switch__input" type="checkbox" id="email:smtpTransport:pool" data-field="email:smtpTransport:pool" name="email:smtpTransport:pool" />
<span class="mdl-switch__label">[[admin/settings/email:smtp-transport.pool]]</span>
</label>
</div>
<p class="col-xs-12 help-block">
[[admin/settings/email:smtp-transport.pool-help]]
</p>
</div>
<div class="form-group">
<label for="email:smtpTransport:service"><strong>[[admin/settings/email:smtp-transport.service]]</strong></label>
<select class="form-control input-lg" id="email:smtpTransport:service" data-field="email:smtpTransport:service">