Archive-Team
/
docker-mailserver
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove `rewrite_subject` action in Rspamd base config

This commit is contained in:
georglauterbach 2024-01-25 18:15:36 +01:00
parent d0eccd322f
commit ab11d8e4a7
No known key found for this signature in database
GPG Key ID: F367F7C43C118578
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
target/rspamd/local.d/actions.conf
View File

@ -6,7 +6,12 @@
# and to be able to explain the impact on the whole system. # and to be able to explain the impact on the whole system.
greylist = 4; greylist = 4;
add_header = 6; add_header = 6;
rewrite_subject = 7;
reject = 11; reject = 11;
subject = "***SPAM*** %s" # The value `null` disabled the action. A subject rewrite is handled by
# SPAM_SUBJECT
# (https://docker-mailserver.github.io/docker-mailserver/edge/config/environment/#spam_subject)
#
# The reasoning for this can be found in
# https://github.com/docker-mailserver/docker-mailserver/issues/3804
rewrite_subject = null;

9
test/tests/parallel/set1/spam_virus/rspamd_full.bats
View File

@ -73,6 +73,15 @@ function teardown_file() { _default_teardown ; }
assert_output 'rspamd_milter = inet:localhost:11332' assert_output 'rspamd_milter = inet:localhost:11332'
} }
@test 'Rspamd base configuration is correct' {
_run_in_container rspamadm configdump actions
assert_success
assert_line 'greylist = 4;'
assert_line 'reject = 11;'
assert_line 'add_header = 6;'
refute_line --regexp 'rewrite_subject = [0-9]+;'
}
@test "contents of '/etc/rspamd/override.d/' are copied" { @test "contents of '/etc/rspamd/override.d/' are copied" {
local OVERRIDE_D='/etc/rspamd/override.d' local OVERRIDE_D='/etc/rspamd/override.d'
_file_exists_in_container "${OVERRIDE_D}/testmodule_complicated.conf" _file_exists_in_container "${OVERRIDE_D}/testmodule_complicated.conf"