From 3db51a723670dba8cf4d8977df97b072c0159f3a Mon Sep 17 00:00:00 2001 From: Jeff Moe Date: Sun, 1 Sep 2024 14:51:40 -0600 Subject: [PATCH] more rspaM --- .../locale/en/LC_MESSAGES/mail-libre-is.po | 48 +++++++++---------- docs/_source/mail-libre-is.rst | 8 +++- 2 files changed, 30 insertions(+), 26 deletions(-) diff --git a/docs/_source/locale/en/LC_MESSAGES/mail-libre-is.po b/docs/_source/locale/en/LC_MESSAGES/mail-libre-is.po index 1775679..af554cc 100644 --- a/docs/_source/locale/en/LC_MESSAGES/mail-libre-is.po +++ b/docs/_source/locale/en/LC_MESSAGES/mail-libre-is.po @@ -30,8 +30,8 @@ msgstr "" #: ../../../_source/mail-libre-is.rst:6 msgid "" -"Setting up Internet mail servers is a pain. It's nothing like just " -"setting up a web server..." +"Setting up Internet mail servers is a pain. It's nothing like just setting " +"up a web server..." msgstr "" #: ../../../_source/mail-libre-is.rst:11 @@ -47,7 +47,8 @@ msgid "``_" msgstr "" #: ../../../_source/mail-libre-is.rst:17 -msgid "For more information and details about what is what, refer to that site." +msgid "" +"For more information and details about what is what, refer to that site." msgstr "" #: ../../../_source/mail-libre-is.rst:20 ../../../_source/mail-libre-is.rst:236 @@ -108,8 +109,7 @@ msgstr "" #: ../../../_source/mail-libre-is.rst:59 msgid "" -"Install Debian stable (bookworm). Install rsyslog for old school " -"convenience:" +"Install Debian stable (bookworm). Install rsyslog for old school convenience:" msgstr "" #: ../../../_source/mail-libre-is.rst:68 @@ -118,9 +118,9 @@ msgstr "" #: ../../../_source/mail-libre-is.rst:69 msgid "" -"The Apache webserver is used out of laziness as it allows easy " -"certificate updates with certbot. A webmail server won't be running on " -"the main mail server." +"The Apache webserver is used out of laziness as it allows easy certificate " +"updates with certbot. A webmail server won't be running on the main mail " +"server." msgstr "" #: ../../../_source/mail-libre-is.rst:78 @@ -167,8 +167,8 @@ msgstr "" #: ../../../_source/mail-libre-is.rst:203 msgid "" -"Note, the licensing of Redis has gone bad. The version in Debian is OK. " -"But in the future, probably replace with a fork." +"Note, the licensing of Redis has gone bad. The version in Debian is OK. But " +"in the future, probably replace with a fork." msgstr "" #: ../../../_source/mail-libre-is.rst:212 @@ -185,8 +185,8 @@ msgstr "" #: ../../../_source/mail-libre-is.rst:222 msgid "" -"Encryption certificates with Let's Encrypt. Not using an Apache webserver" -" on the mail server makes getting new certificates a bit more complex." +"Encryption certificates with Let's Encrypt. Not using an Apache webserver on " +"the mail server makes getting new certificates a bit more complex." msgstr "" #: ../../../_source/mail-libre-is.rst:237 @@ -195,15 +195,15 @@ msgstr "" #: ../../../_source/mail-libre-is.rst:244 msgid "" -"Note, since IPv6 isn't being used, the dovecot install barfs. Edit " -"/etc/dovecot/dovecot.conf and add this line, where appropriate:" +"Note, since IPv6 isn't being used, the dovecot install barfs. Edit /etc/" +"dovecot/dovecot.conf and add this line, where appropriate:" msgstr "" #: ../../../_source/mail-libre-is.rst:251 msgid "" -"Note, this is removing the \"::\" from listen, which using IPv6. Then re-" -"run the install so the packages are happy. Note, the re-install won't " -"overwrite the \"listen\" change." +"Note, this is removing the \"::\" from listen, which using IPv6. Then re-run " +"the install so the packages are happy. Note, the re-install won't overwrite " +"the \"listen\" change." msgstr "" #: ../../../_source/mail-libre-is.rst:260 @@ -283,8 +283,8 @@ msgstr "" #: ../../../_source/mail-libre-is.rst:436 msgid "" -"Allow aliases to send by adding this file (XXX check OK) " -"/etc/postfix/aliases.cf with this contents:" +"Allow aliases to send by adding this file (XXX check OK) /etc/postfix/" +"aliases.cf with this contents:" msgstr "" #: ../../../_source/mail-libre-is.rst:444 @@ -312,7 +312,8 @@ msgid "Create dir for new sieve filter:" msgstr "" #: ../../../_source/mail-libre-is.rst:479 -msgid "Create /etc/dovecot/sieve-after/spam-to-folder.sieve with these contents:" +msgid "" +"Create /etc/dovecot/sieve-after/spam-to-folder.sieve with these contents:" msgstr "" #: ../../../_source/mail-libre-is.rst:490 @@ -324,7 +325,8 @@ msgid "Set up redis by adding /etc/rspamd/override.d/redis.conf with this:" msgstr "" #: ../../../_source/mail-libre-is.rst:502 -msgid "Add this /etc/rspamd/override.d/classifier-bayes.conf with below contents:" +msgid "" +"Add this /etc/rspamd/override.d/classifier-bayes.conf with below contents:" msgstr "" #: ../../../_source/mail-libre-is.rst:508 @@ -337,8 +339,7 @@ msgstr "" #: ../../../_source/mail-libre-is.rst:520 msgid "" -"Edit /etc/dovecot/conf.d/90-sieve.conf and add below to \"plugins\" " -"section:" +"Edit /etc/dovecot/conf.d/90-sieve.conf and add below to \"plugins\" section:" msgstr "" #: ../../../_source/mail-libre-is.rst:545 @@ -508,4 +509,3 @@ msgstr "" #: ../../../_source/mail-libre-is.rst:798 msgid "Set up DNS." msgstr "" - diff --git a/docs/_source/mail-libre-is.rst b/docs/_source/mail-libre-is.rst index 2ce7da0..d2a77b9 100644 --- a/docs/_source/mail-libre-is.rst +++ b/docs/_source/mail-libre-is.rst @@ -553,12 +553,16 @@ Create /etc/dovecot/sieve/learn-ham.sieve and add: .. code-block:: cfg - require ["vnd.dovecot.pipe", "copy", "imapsieve", "variables"]; - if string "${mailbox}" "Trash" { + require ["vnd.dovecot.pipe", "copy", "imapsieve", "environment", "variables"]; + if environment :matches "imap.mailbox" "*" { + set "mailbox" "${1}"; + } + if string :matches "${mailbox}" ["*/Trash", "Trash"] { stop; } pipe :copy "rspamd-learn-ham.sh"; + Run this to compile: .. code-block:: sh