From dd83a2c7ad6b30d9a0109c82143e08a877b3f3fb Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 12 May 2025 03:13:14 +0200 Subject: [PATCH] dovecot: rename sieve bayes/ham learning script Updates the spamassasin reference to talk about rspamd. --- mail-server/dovecot.nix | 4 ++-- mail-server/dovecot/imap_sieve/report-ham.sieve | 2 +- mail-server/dovecot/imap_sieve/report-spam.sieve | 2 +- tests/external.nix | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/mail-server/dovecot.nix b/mail-server/dovecot.nix index 64a13b2..27af741 100644 --- a/mail-server/dovecot.nix +++ b/mail-server/dovecot.nix @@ -205,9 +205,9 @@ in ''; pipeBins = map lib.getExe [ - (pkgs.writeShellScriptBin "sa-learn-ham.sh" + (pkgs.writeShellScriptBin "rspamd-learn-ham.sh" "exec ${pkgs.rspamd}/bin/rspamc -h /run/rspamd/worker-controller.sock learn_ham") - (pkgs.writeShellScriptBin "sa-learn-spam.sh" + (pkgs.writeShellScriptBin "rspamd-learn-spam.sh" "exec ${pkgs.rspamd}/bin/rspamc -h /run/rspamd/worker-controller.sock learn_spam") ]; }; diff --git a/mail-server/dovecot/imap_sieve/report-ham.sieve b/mail-server/dovecot/imap_sieve/report-ham.sieve index a9d30cf..720be7a 100644 --- a/mail-server/dovecot/imap_sieve/report-ham.sieve +++ b/mail-server/dovecot/imap_sieve/report-ham.sieve @@ -12,4 +12,4 @@ if environment :matches "imap.user" "*" { set "username" "${1}"; } -pipe :copy "sa-learn-ham.sh" [ "${username}" ]; +pipe :copy "rspamd-learn-ham.sh" [ "${username}" ]; diff --git a/mail-server/dovecot/imap_sieve/report-spam.sieve b/mail-server/dovecot/imap_sieve/report-spam.sieve index 4024b7a..4681aac 100644 --- a/mail-server/dovecot/imap_sieve/report-spam.sieve +++ b/mail-server/dovecot/imap_sieve/report-spam.sieve @@ -4,4 +4,4 @@ if environment :matches "imap.user" "*" { set "username" "${1}"; } -pipe :copy "sa-learn-spam.sh" [ "${username}" ]; \ No newline at end of file +pipe :copy "rspamd-learn-spam.sh" [ "${username}" ]; diff --git a/tests/external.nix b/tests/external.nix index 61ffb4f..c32a9e1 100644 --- a/tests/external.nix +++ b/tests/external.nix @@ -473,9 +473,9 @@ server.wait_until_fails('[ "$(postqueue -p)" != "Mail queue is empty" ]') client.succeed("imap-mark-spam >&2") - server.wait_until_succeeds("journalctl -u dovecot2 | grep -i sa-learn-spam.sh >&2") + server.wait_until_succeeds("journalctl -u dovecot2 | grep -i rspamd-learn-spam.sh >&2") client.succeed("imap-mark-ham >&2") - server.wait_until_succeeds("journalctl -u dovecot2 | grep -i sa-learn-ham.sh >&2") + server.wait_until_succeeds("journalctl -u dovecot2 | grep -i rspamd-learn-ham.sh >&2") with subtest("full text search and indexation"): # send 2 email from user2 to user1