Skip to content

Commit

Permalink
Release v1.2.1 (#16)
Browse files Browse the repository at this point in the history
* fix: use arrow fn in load_qmd_ini callback
  • Loading branch information
msimerson authored Jun 13, 2023
1 parent e5a5dd9 commit cb4fe39
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 6 deletions.
6 changes: 6 additions & 0 deletions Changes.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
8 changes: 5 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ exports.load_qmd_ini = function () {
'*.check_mail_from',
]
},
function () {
() => {
this.load_qmd_ini()
})

Expand Down Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down

0 comments on commit cb4fe39

Please sign in to comment.