From 29a31ebad90677606dfe562554f758d86ce3c22b Mon Sep 17 00:00:00 2001 From: Matt Simerson Date: Mon, 22 Apr 2024 18:15:41 -0700 Subject: [PATCH] Release v1.2.3 (#19) * fix: use outbound.send_trans_email (was o.send_email) * dep(@haraka/eslint-config): bump ver --- .eslintrc.yaml | 2 +- .release | 2 +- CHANGELOG.md | 8 +++++++- CONTRIBUTORS.md | 2 +- README.md | 9 ++++----- index.js | 2 +- package.json | 4 ++-- test/index.js | 2 -- 8 files changed, 17 insertions(+), 14 deletions(-) diff --git a/.eslintrc.yaml b/.eslintrc.yaml index f45c707..4c1bf2a 100644 --- a/.eslintrc.yaml +++ b/.eslintrc.yaml @@ -7,4 +7,4 @@ env: extends: ['@haraka'] rules: - no-unused-vars: 1 \ No newline at end of file + no-unused-vars: 1 diff --git a/.release b/.release index 36bb27a..d42be1e 160000 --- a/.release +++ b/.release @@ -1 +1 @@ -Subproject commit 36bb27a93862517943e04f24fd67b0df2da6cbbe +Subproject commit d42be1e01222d43ede81ff28cc4d5ec9440d229b diff --git a/CHANGELOG.md b/CHANGELOG.md index 249c82e..40cb245 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,11 +4,16 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/). ### Unreleased -### [1.2.2] - 2024-04-22 +### [1.2.3] - 2024-04-22 +- fix: use outbound.send_trans_email (was o.send_email) - populate [files] in package.json. - dep: eslint-plugin-haraka -> @haraka/eslint-config - lint: remove duplicate / stale rules from .eslintrc +- prettier +- ci: use more shared GHA workflows +- doc(CONTRIBUTORS): added +- doc(CHANGELOG): fixed version release URLs ### [1.2.1] - 2023-06-12 @@ -74,3 +79,4 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/). [1.2.1]: https://github.com/haraka/haraka-plugin-qmail-deliverable/releases/tag/v1.2.1 [1.2.2]: https://github.com/haraka/haraka-plugin-qmail-deliverable/releases/tag/v1.2.2 [1.3.0]: https://github.com/haraka/haraka-plugin-qmail-deliverable/releases/tag/v1.3.0 +[1.2.3]: https://github.com/haraka/haraka-plugin-qmail-deliverable/releases/tag/v1.2.3 diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 8e64159..b73e0b3 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -2,7 +2,7 @@ This handcrafted artisinal software is brought to you by: -|
msimerson (23) |
Dexus (1) |
smfreegard (1) | +|
msimerson (24) |
Dexus (1) |
smfreegard (1) | | :--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | this file is maintained by [.release](https://github.com/msimerson/.release) diff --git a/README.md b/README.md index 2f07d80..95e31fb 100644 --- a/README.md +++ b/README.md @@ -10,16 +10,13 @@ On incoming messages (relaying=false), validate the RCPT TO address. ## Configuration -The host and port that qmail-deliverabled is listening on can be set by -altering the contents of `config/qmail-deliverable.ini` +The host and port that qmail-deliverabled is listening on can be set in `config/qmail-deliverable.ini` - `host` (Default: localhost) - - `port` (Default: 8998) - - `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`. This information can be used later to determine mail handling. +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 influence mail routing. ### Fine control of MX routing @@ -34,11 +31,13 @@ MX routing for individual domains can be set by defining `queue` and `next_hop`. Domains can have their own configuration. The defaults are the same, so only the differences needs to be declared. Example: + ```ini [example.com] host=192.168.0.1 [example2.com] host=192.168.0.2 + ``` diff --git a/index.js b/index.js index 7ba2466..06f417b 100644 --- a/index.js +++ b/index.js @@ -266,7 +266,7 @@ exports.hook_queue = function (next, connection) { case 'lmtp': case 'outbound': this.logdebug(`routing to outbound: queue.wants=${qw}`) - outbound.send_email(connection.transaction, next) + outbound.send_trans_email(connection.transaction, next) break default: next() // do nothing diff --git a/package.json b/package.json index 70f41d9..2e8cf4d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "haraka-plugin-qmail-deliverable", - "version": "1.2.2", + "version": "1.2.3", "description": "Haraka plugin that validates recipients against Qmail::Deliverable", "main": "index.js", "files": [ @@ -34,7 +34,7 @@ }, "homepage": "https://github.com/haraka/haraka-plugin-qmail-deliverable#readme", "devDependencies": { - "@haraka/eslint-config": "^1.1.3", + "@haraka/eslint-config": "^1.1.5", "address-rfc2821": "^2.1.2", "haraka-test-fixtures": "^1.3.7" } diff --git a/test/index.js b/test/index.js index f6c7aff..c48d7d2 100644 --- a/test/index.js +++ b/test/index.js @@ -1,5 +1,3 @@ -'use strict' - const assert = require('assert') const Address = require('address-rfc2821').Address