diff --git a/Changes.md b/Changes.md index 70734f3..ffc0c4c 100644 --- a/Changes.md +++ b/Changes.md @@ -1,6 +1,11 @@ ### Unreleased +### [1.2.1] - 2023-06-12 + +- fix: use arrow fn in load_qmd_ini callback + + ### [1.2.0] - 2023-06-12 - previously, would set next_hop=lmtp w/o setting q.wants=lmtp @@ -65,3 +70,4 @@ [1.1.0]: https://github.com/haraka/haraka-plugin-qmail-deliverable/releases/tag/1.1.0 [1.1.1]: https://github.com/haraka/haraka-plugin-qmail-deliverable/releases/tag/1.1.1 [1.2.0]: https://github.com/haraka/haraka-plugin-qmail-deliverable/releases/tag/1.2.0 +[1.2.1]: https://github.com/haraka/haraka-plugin-qmail-deliverable/releases/tag/1.2.1 diff --git a/README.md b/README.md index 67a8402..8e888f3 100644 --- a/README.md +++ b/README.md @@ -19,13 +19,15 @@ altering the contents of `config/qmail-deliverable.ini` * `check_mail_from`= (Default: true) -When `check_mail_from` is enabled, the MAIL FROM address is checked for deliverability. The deliverable status can be inspected by checking `transaction.notes.local_sender`. +When `check_mail_from` is enabled, the MAIL FROM address is checked for deliverability. The deliverable status can be inspected by checking `transaction.notes.local_sender`. This information can be used later to determine mail handling. + +### Fine control of MX routing MX routing for individual domains can be set by defining `queue` and `next_hop`. -* `queue`: a queue plugin (smtp_forward, qmail-queue), or lmtp. When `queue=lmtp`, if qmail-deliverable reports that the destination address is a mailbox (ie, not email list, forward, alias, etc.), then this plugin will configure the next_hop to be `lmtp://$host/` and will set up that route (via get_mx) so that outbound delivers the message to the mailbox via LMTP. +* `queue`: a queue plugin (smtp_forward, qmail-queue, lmtp), or lmtp. When `queue=lmtp`, if qmail-deliverable reports that the destination address is a mailbox (ie, not email list, forward, alias, etc.), then this plugin will configure the next_hop to be `lmtp://$host/` and will set up that route (via `get_mx()`) so that outbound delivers the message to the mailbox via LMTP. -* `next_hop`: a URL. Examples: `smtp://mx.example.com` and `lmtp://int.mx.example.com:24` +* `next_hop`: a URL. Examples: `smtp://mx.example.com` and `lmtp://int.mx.example.com:24`. This plugin uses next_hop to direct messages to local mailboxes via LMTP. If the LMTP server (dovecot, in my case) is not the same host that is running qmail-deliverabled, set next_hop accordingly. ## Per-domain Configuration diff --git a/index.js b/index.js index c04eb43..37a04b0 100644 --- a/index.js +++ b/index.js @@ -28,7 +28,7 @@ exports.load_qmd_ini = function () { '*.check_mail_from', ] }, - function () { + () => { this.load_qmd_ini() }) @@ -270,7 +270,7 @@ exports.hook_queue = function (next, connection) { switch (qw) { case 'lmtp': case 'outbound': - this.loginfo(`routing to outbound: queue.wants=${qw}`); + this.logdebug(`routing to outbound: queue.wants=${qw}`); outbound.send_email(connection.transaction, next); break; default: diff --git a/package.json b/package.json index 9bdf12f..195ab80 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "haraka-plugin-qmail-deliverable", - "version": "1.2.0", + "version": "1.2.1", "description": "Haraka plugin that validates recipients against Qmail::Deliverable", "main": "index.js", "scripts": {