From f4fe5bf527f019c25ad3b294e9939f1a32188d10 Mon Sep 17 00:00:00 2001
From: Casper <casperklein@users.noreply.github.com>
Date: Mon, 27 Mar 2023 01:59:43 +0200
Subject: [PATCH] Update SA_KILL values; follow up to  #3058 (#3204)

---
 docs/content/config/environment.md              | 2 +-
 target/scripts/startup/variables-stack.sh       | 2 +-
 test/tests/parallel/set1/spam_virus/amavis.bats | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/content/config/environment.md b/docs/content/config/environment.md
index 7dbe8f78..582c4dad 100644
--- a/docs/content/config/environment.md
+++ b/docs/content/config/environment.md
@@ -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`"
 
diff --git a/target/scripts/startup/variables-stack.sh b/target/scripts/startup/variables-stack.sh
index ffdb4528..85412197 100644
--- a/target/scripts/startup/variables-stack.sh
+++ b/target/scripts/startup/variables-stack.sh
@@ -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"}
diff --git a/test/tests/parallel/set1/spam_virus/amavis.bats b/test/tests/parallel/set1/spam_virus/amavis.bats
index 875127b1..ba737806 100644
--- a/test/tests/parallel/set1/spam_virus/amavis.bats
+++ b/test/tests/parallel/set1/spam_virus/amavis.bats
@@ -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