diff --git a/config/rspamd/APKBUILD b/config/rspamd/APKBUILD index 39091d0..4ea79b3 100644 --- a/config/rspamd/APKBUILD +++ b/config/rspamd/APKBUILD @@ -3,7 +3,7 @@ . ../APKBUILD-config.template -pkgver=2022.03.24.01 +pkgver=2022.04.02.01 pkgrel=0 _baseconf=" rspamd.conf @@ -66,14 +66,14 @@ a753d136a21206cdc28a1554a38f51ad55e2eec842a31dbe1d151198bb8d9bb090e0f49b6b50cbc4 08966d0a3c077a12a1113f774e11d51d3c7d04bb45914e295324e8aa51c3d75b55395c256a905c6d9ae1e98a004a9e6b3b37d36fce810a426dd5d90408331c0a maillist.conf 8dc0e553cdb92517b22767cbef085afb35d67389d5225bec791b0239452b69f9adbc12edfa6319670099de82ba09d9a4b1d54d90c5534e28f1008b391e1bdb12 hfilter.conf 8660fd01589476bbc01bbe75bed392faa55f55fa9b6fea77be79f339cefb43ddbacdbe193ad136c42da91d4ef7f1e1ec40fc5f8f4f398d04bcebf51d5a59ad1f greylist.conf -b8a1c217e7802f286bcf69bd79c2a48eff37df4e0b9d692ebd705b13804fe5f3a6b68ff3bdfa7b3ecbe63d4c6e3ab69b157b43294521a280c8a3e32441604a72 force_actions.conf +aa2cba13ed7b065cd34bf7c3f5b50a2f1f48b66e575e869382f2f26fbeb08d8aae8478220e41d999a03a8918ddf37c64f0867a4aad7359d24ff9fc463a257aa8 force_actions.conf 17fec11d41106909dfb7bd790ff12b4f546d2b1e6c06205ea48ecf2b82ce028710fd6ca636f414c0fe35dda99257c20eaed4d4ff90cdcc0a86d552f98cb26d15 fuzzy_check.conf edc76ef05c986aca3ef98cd0a6fac95c0c2d9fe3bc37f1b699de9f5261a81e9b076168b0fc020ba8d313c23b2a3f77cdbe78b099d385b6777db72ded2a525621 dmarc.conf ad3fa5e3c4c3d7b882c9e85bdde3b1949a32f2f2c9dd43e38977d828e7b6740d31002c502f24a0ea2e27105d5a6b1af7b7140c5d8e306f90c3f7d28c1e4607d5 dkim.conf dcec5c53bd29c345ed5c47727af9a8d11328cc8f69ae61064ba3b053ee306baa79b747067097b2354a1fecd6e6527d56d14c79be22c94531f2a5ddc41ce3ca7e chartable.conf eacbbe96fdfea9112b633bdf5471fcf8b2c297513685397759d588ad47905cf225dae3e4262dacb14477a2f52e6d3bf93b57abaf205719481f11a9ec8552fe07 arc.conf 30213e30941be39203e63bb2bd25c66d7b8ce85a8ff11cdfa16cc98a2edbead4daa43d39a01fef8e7365a2e6dca98350807a64404a94ace1f02271e8b4c9e511 rspamd.conf -edae8f99503c6396df0bc59b581e6e324c9f4d666dc5dcbb9721c1b806e62627470c086b8780d7f7040b22655f2a25aaec6edb261c56e6fc9f091d75afadcf7f composites.conf +6ff4f88d00fe3497ec15cd4bebc0a43b17e182f681fc60b6d01ad27badc00b261ed0f324910af85eaf8c8c10e06adeeb90e4973ec290e4e842d073df227287f5 composites.conf 85470ad10b9b10573b9e0338044a0cc9b8c0de91503fab7b803b9dcfe60fc396622eb40bc146be1ebcf6fb4b3a17206d40c0cb99f9958b1cb87c50082fda6f22 groups.conf 99d6b2b173ac5b62977562bb3f2d04cf29d3d94329a4b2abc120e6cca6da79d5ac2a35a16832f62b8e1fed331b6724f21b5e1aab076bd3c57b28b2261302238a logging.conf e40a35928fe429c98301a4fd25d6fb71801ad0a78fa244423726df0bf069950756c77a1d03c77b8dcdae8eda27d3dd95ab67964fad005b90547fafb12718c28d statistic.conf diff --git a/config/rspamd/composites.conf b/config/rspamd/composites.conf index 6a3734c..4197b45 100644 --- a/config/rspamd/composites.conf +++ b/config/rspamd/composites.conf @@ -3,13 +3,13 @@ composites { expression = "FORGED_SENDER | FORGED_RECIPIENTS"; } FORGED_RECIPIENTS_MAILLIST { - expression = "FORGED_RECIPIENTS & -MAILLIST"; + expression = "~FORGED_RECIPIENTS & MAILLIST"; } FORGED_SENDER_MAILLIST { - expression = "FORGED_SENDER & -MAILLIST"; + expression = "~FORGED_SENDER & MAILLIST"; } REPLYTO_MAILLIST { - expression = "REPLYTO_EQ_TO_ADDR & -MAILLIST"; + expression = "~REPLYTO_EQ_TO_ADDR & MAILLIST"; } RBL_SPAMHAUS_DROP_ANY { expression = "RBL_SPAMHAUS_DROP | RECEIVED_SPAMHAUS_DROP | URIBL_DROP"; diff --git a/config/rspamd/modules/force_actions.conf b/config/rspamd/modules/force_actions.conf index e39f85f..17d178f 100644 --- a/config/rspamd/modules/force_actions.conf +++ b/config/rspamd/modules/force_actions.conf @@ -5,11 +5,6 @@ force_actions { 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";