From 7d84fce442cef83632794fb88849026c912b41a1 Mon Sep 17 00:00:00 2001 From: Alex Denes Date: Thu, 24 Mar 2022 06:20:17 +0000 Subject: [PATCH] Fix force_actions, this time for real --- config/rspamd/APKBUILD | 4 ++-- config/rspamd/modules/force_actions.conf | 13 +++++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/config/rspamd/APKBUILD b/config/rspamd/APKBUILD index 6252730..39091d0 100644 --- a/config/rspamd/APKBUILD +++ b/config/rspamd/APKBUILD @@ -3,7 +3,7 @@ . ../APKBUILD-config.template -pkgver=2022.03.20.01 +pkgver=2022.03.24.01 pkgrel=0 _baseconf=" rspamd.conf @@ -66,7 +66,7 @@ a753d136a21206cdc28a1554a38f51ad55e2eec842a31dbe1d151198bb8d9bb090e0f49b6b50cbc4 08966d0a3c077a12a1113f774e11d51d3c7d04bb45914e295324e8aa51c3d75b55395c256a905c6d9ae1e98a004a9e6b3b37d36fce810a426dd5d90408331c0a maillist.conf 8dc0e553cdb92517b22767cbef085afb35d67389d5225bec791b0239452b69f9adbc12edfa6319670099de82ba09d9a4b1d54d90c5534e28f1008b391e1bdb12 hfilter.conf 8660fd01589476bbc01bbe75bed392faa55f55fa9b6fea77be79f339cefb43ddbacdbe193ad136c42da91d4ef7f1e1ec40fc5f8f4f398d04bcebf51d5a59ad1f greylist.conf -30f2153b379485446d3c59b4cbf748740b9a3eb7ec9a48c80b1b077a9ae6b7f198b608bcff2dbed707cf72f7064983c0c6bbfd5e52a2501c2c9f62f4e4feaba1 force_actions.conf +b8a1c217e7802f286bcf69bd79c2a48eff37df4e0b9d692ebd705b13804fe5f3a6b68ff3bdfa7b3ecbe63d4c6e3ab69b157b43294521a280c8a3e32441604a72 force_actions.conf 17fec11d41106909dfb7bd790ff12b4f546d2b1e6c06205ea48ecf2b82ce028710fd6ca636f414c0fe35dda99257c20eaed4d4ff90cdcc0a86d552f98cb26d15 fuzzy_check.conf edc76ef05c986aca3ef98cd0a6fac95c0c2d9fe3bc37f1b699de9f5261a81e9b076168b0fc020ba8d313c23b2a3f77cdbe78b099d385b6777db72ded2a525621 dmarc.conf ad3fa5e3c4c3d7b882c9e85bdde3b1949a32f2f2c9dd43e38977d828e7b6740d31002c502f24a0ea2e27105d5a6b1af7b7140c5d8e306f90c3f7d28c1e4607d5 dkim.conf diff --git a/config/rspamd/modules/force_actions.conf b/config/rspamd/modules/force_actions.conf index 6a64bf3..e39f85f 100644 --- a/config/rspamd/modules/force_actions.conf +++ b/config/rspamd/modules/force_actions.conf @@ -1,53 +1,66 @@ force_actions { rules { DMARC_POLICY_REJECT { + expression = "DMARC_POLICY_REJECT"; action = "reject"; message = "DMARC failed" } DMARC_POLICY_SOFTFAIL { + expression = "DMARC_POLICY_SOFTFAIL"; action = "soft reject"; message = "DMARC failed temporarily, please retry later" } DMARC_POLICY_QUARANTINE { + expression = "DMARC_POLICY_QUARANTINE"; action = "add header"; } ARC_REJECT { + expression = "ARC_REJECT"; action = "reject"; message = "ARC failed" } FORGED_ANY { + expression = "FORGED_ANY"; action = "reject"; message = "You may not send mails with a forged/modified sender/reciever here." } RBL_SPAMHAUS_DROP_ANY { + expression = "RBL_SPAMHAUS_DROP_ANY"; action = "reject"; message = "Mail sender / contents are listed on SPAMHAUS DROP" } RBL_SPAMHAUS_XBL_ANY { + expression = "RBL_SPAMHAUS_XBL_ANY"; action = "soft reject"; message = "Mail sender / contents are listed on SPAMHAUS XBL" } URIBL_BLACK { + expression = "URIBL_BLACK"; action = "reject" message = "You are listed on URIBL black" } URIBL_GREY { + expression = "URIBL_GREY"; action = "soft reject" message = "You are listed on URIBL grey" } RBL_MAILSPIKE_BAD { + expression = "RBL_MAILSPIKE_BAD"; action = "soft reject" message = "You are listed on Mailspike as bad" } RBL_MAILSPIKE_VERYBAD { + expression = "RBL_MAILSPIKE_VERYBAD"; action = "reject" message = "You are listed on Mailspike as very bad" } RBL_MAILSPIKE_WORST { + expression = "RBL_MAILSPIKE_WORST"; action = "reject" message = "You are listed on Mailspike as worst" } SPAMTRAP { + expression = "SPAMTRAP"; action = "reject" message = "Thank you kind sir" }