commit a48d6fc: Merge pull request #4397 from twesterhever/temp-misc-cleanups-and-housekeeping

[GitHub]

Author: Vsevolod Stakhov
Date: 2023-02-17 21:55:35 +0000
URL: https://github.com/rspamd/rspamd/commit/a48d6fc4dfed4a91211ef8f976ec9e833da12a0d (HEAD -> master)

Merge pull request #4397 from twesterhever/temp-misc-cleanups-and-housekeeping
[Minor] Assorted cleanup and housekeeping of configuration files

 conf/actions.conf                   |   2 +-
 conf/composites.conf                |  15 +-
 conf/maps.d/maillist.inc            | 340 ++++++++++++++++--------------------
 conf/maps.d/redirectors.inc         |   2 +-
 conf/maps.d/surbl-whitelist.inc     |  24 +--
 conf/modules.d/bimi.conf            |   2 +-
 conf/modules.d/clickhouse.conf      |   1 -
 conf/modules.d/multimap.conf        |   1 -
 conf/modules.d/rbl.conf             |  15 +-
 conf/modules.d/redis.conf           |   2 +-
 conf/modules.d/spamassassin.conf    |   2 +-
 conf/scores.d/content_group.conf    |   7 +-
 conf/scores.d/headers_group.conf    |   1 +
 conf/scores.d/mime_types_group.conf |   5 +-
 conf/scores.d/policies_group.conf   |   4 -
 conf/scores.d/rbl_group.conf        |  51 +++---
 conf/scores.d/subject_group.conf    |   4 +-
 conf/scores.d/surbl_group.conf      |  69 ++++----
 rules/content.lua                   |   2 +-
 rules/forwarding.lua                |   1 -
 rules/mid.lua                       |   1 -
 rules/regexp/compromised_hosts.lua  |   1 -
 rules/regexp/misc.lua               |   2 +-
 rules/subject_checks.lua            |   2 +-
 24 files changed, 251 insertions(+), 305 deletions(-)