docker
/
docker-mailserver
mirror of https://github.com/tomav/docker-mailserver.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Update SA_KILL values; follow up to #3058 (#3204)

This commit is contained in:
Casper 2023-03-27 01:59:43 +02:00 committed by GitHub
parent 6fa06f4986
commit f4fe5bf527
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/content/config/environment.md
View File

@ -464,7 +464,7 @@ Note: this SpamAssassin setting needs `ENABLE_SPAMASSASSIN=1`
##### SA_KILL
- **6.31** => triggers spam evasive actions
- **10.0** => triggers spam evasive actions
!!! note "This SpamAssassin setting needs `ENABLE_SPAMASSASSIN=1`"

2
target/scripts/startup/variables-stack.sh
View File

@ -56,7 +56,7 @@ function __environment_variables_general_setup
VARS[POSTGREY_TEXT]="${POSTGREY_TEXT:=Delayed by Postgrey}"
VARS[POSTSCREEN_ACTION]="${POSTSCREEN_ACTION:=enforce}"
VARS[RSPAMD_LEARN]="${RSPAMD_LEARN:=0}"
VARS[SA_KILL]=${SA_KILL:="6.31"}
VARS[SA_KILL]=${SA_KILL:="10.0"}
VARS[SA_SPAM_SUBJECT]=${SA_SPAM_SUBJECT:="***SPAM*** "}
VARS[SA_TAG]=${SA_TAG:="2.0"}
VARS[SA_TAG2]=${SA_TAG2:="6.31"}

2
test/tests/parallel/set1/spam_virus/amavis.bats
View File

@ -71,7 +71,7 @@ function teardown_file() {
_run_in_container grep '\$sa_kill_level_deflt' "${AMAVIS_DEFAULTS_FILE}"
assert_success
assert_output --partial '= 6.31'
assert_output --partial '= 10.0'
_run_in_container grep '\$sa_spam_subject_tag' "${AMAVIS_DEFAULTS_FILE}"
assert_success