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

rename `SA_SPAM_SUBJECT` to `SPAM_SUBJECT` in code

This commit is contained in:
georglauterbach 2024-01-25 18:16:29 +01:00
parent 6a79f6124a
commit bc6786ec87
No known key found for this signature in database
GPG Key ID: F367F7C43C118578
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
target/scripts/startup/setup.d/security/misc.sh
View File

@ -81,12 +81,12 @@ function __setup__security__spamassassin() {
# shellcheck disable=SC2016 # shellcheck disable=SC2016
sed -i -r 's|^\$sa_kill_level_deflt (.*);|\$sa_kill_level_deflt = '"${SA_KILL}"';|g' /etc/amavis/conf.d/20-debian_defaults sed -i -r 's|^\$sa_kill_level_deflt (.*);|\$sa_kill_level_deflt = '"${SA_KILL}"';|g' /etc/amavis/conf.d/20-debian_defaults
if [[ ${SA_SPAM_SUBJECT} == 'undef' ]]; then if [[ -z ${SPAM_SUBJECT} ]]; then
# shellcheck disable=SC2016 # shellcheck disable=SC2016
sed -i -r 's|^\$sa_spam_subject_tag (.*);|\$sa_spam_subject_tag = undef;|g' /etc/amavis/conf.d/20-debian_defaults sed -i -r 's|^\$sa_spam_subject_tag (.*);|\$sa_spam_subject_tag = undef;|g' /etc/amavis/conf.d/20-debian_defaults
else else
# shellcheck disable=SC2016 # shellcheck disable=SC2016
sed -i -r 's|^\$sa_spam_subject_tag (.*);|\$sa_spam_subject_tag = '"'${SA_SPAM_SUBJECT}'"';|g' /etc/amavis/conf.d/20-debian_defaults sed -i -r 's|^\$sa_spam_subject_tag (.*);|\$sa_spam_subject_tag = '"'${SPAM_SUBJECT}'"';|g' /etc/amavis/conf.d/20-debian_defaults
fi fi
# activate short circuits when SA BAYES is certain it has spam or ham. # activate short circuits when SA BAYES is certain it has spam or ham.

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

@ -67,7 +67,7 @@ function __environment_variables_general_setup() {
VARS[RSPAMD_HFILTER_HOSTNAME_UNKNOWN_SCORE]="${RSPAMD_HFILTER_HOSTNAME_UNKNOWN_SCORE:=6}" VARS[RSPAMD_HFILTER_HOSTNAME_UNKNOWN_SCORE]="${RSPAMD_HFILTER_HOSTNAME_UNKNOWN_SCORE:=6}"
VARS[RSPAMD_LEARN]="${RSPAMD_LEARN:=0}" VARS[RSPAMD_LEARN]="${RSPAMD_LEARN:=0}"
VARS[SA_KILL]=${SA_KILL:="10.0"} VARS[SA_KILL]=${SA_KILL:="10.0"}
VARS[SA_SPAM_SUBJECT]=${SA_SPAM_SUBJECT:="***SPAM*** "} VARS[SPAM_SUBJECT]=${SPAM_SUBJECT:=}
VARS[SA_TAG]=${SA_TAG:="2.0"} VARS[SA_TAG]=${SA_TAG:="2.0"}
VARS[SA_TAG2]=${SA_TAG2:="6.31"} VARS[SA_TAG2]=${SA_TAG2:="6.31"}
VARS[SPAMASSASSIN_SPAM_TO_INBOX]="${SPAMASSASSIN_SPAM_TO_INBOX:=1}" VARS[SPAMASSASSIN_SPAM_TO_INBOX]="${SPAMASSASSIN_SPAM_TO_INBOX:=1}"

6
test/tests/parallel/set1/spam_virus/spam_junk_folder.bats
View File

@ -34,7 +34,7 @@ function teardown() { _default_teardown ; }
local CUSTOM_SETUP_ARGUMENTS=( local CUSTOM_SETUP_ARGUMENTS=(
--env ENABLE_AMAVIS=1 --env ENABLE_AMAVIS=1
--env ENABLE_SPAMASSASSIN=1 --env ENABLE_SPAMASSASSIN=1
--env SA_SPAM_SUBJECT="SPAM: " --env SPAM_SUBJECT="SPAM: "
--env SPAMASSASSIN_SPAM_TO_INBOX=1 --env SPAMASSASSIN_SPAM_TO_INBOX=1
--env MOVE_SPAM_TO_JUNK=0 --env MOVE_SPAM_TO_JUNK=0
--env PERMIT_DOCKER=container --env PERMIT_DOCKER=container
@ -55,7 +55,7 @@ function teardown() { _default_teardown ; }
local CUSTOM_SETUP_ARGUMENTS=( local CUSTOM_SETUP_ARGUMENTS=(
--env ENABLE_AMAVIS=1 --env ENABLE_AMAVIS=1
--env ENABLE_SPAMASSASSIN=1 --env ENABLE_SPAMASSASSIN=1
--env SA_SPAM_SUBJECT="SPAM: " --env SPAM_SUBJECT="SPAM: "
--env SPAMASSASSIN_SPAM_TO_INBOX=1 --env SPAMASSASSIN_SPAM_TO_INBOX=1
--env MOVE_SPAM_TO_JUNK=1 --env MOVE_SPAM_TO_JUNK=1
--env PERMIT_DOCKER=container --env PERMIT_DOCKER=container
@ -77,7 +77,7 @@ function teardown() { _default_teardown ; }
local CUSTOM_SETUP_ARGUMENTS=( local CUSTOM_SETUP_ARGUMENTS=(
--env ENABLE_AMAVIS=1 --env ENABLE_AMAVIS=1
--env ENABLE_SPAMASSASSIN=1 --env ENABLE_SPAMASSASSIN=1
--env SA_SPAM_SUBJECT="SPAM: " --env SPAM_SUBJECT="SPAM: "
--env SPAMASSASSIN_SPAM_TO_INBOX=1 --env SPAMASSASSIN_SPAM_TO_INBOX=1
--env MARK_SPAM_AS_READ=1 --env MARK_SPAM_AS_READ=1
--env PERMIT_DOCKER=container --env PERMIT_DOCKER=container

6
test/tests/parallel/set1/spam_virus/undef_spam_subject.bats
View File

@ -9,12 +9,12 @@ CONTAINER_NAME=${CONTAINER2_NAME}
function teardown() { _default_teardown ; } function teardown() { _default_teardown ; }
@test "'SA_SPAM_SUBJECT=undef' should update Amavis config" { @test "'SPAM_SUBJECT=undef' should update Amavis config" {
export CONTAINER_NAME=${CONTAINER1_NAME} export CONTAINER_NAME=${CONTAINER1_NAME}
local CUSTOM_SETUP_ARGUMENTS=( local CUSTOM_SETUP_ARGUMENTS=(
--env ENABLE_AMAVIS=1 --env ENABLE_AMAVIS=1
--env ENABLE_SPAMASSASSIN=1 --env ENABLE_SPAMASSASSIN=1
--env SA_SPAM_SUBJECT='undef' --env SPAM_SUBJECT='undef'
) )
_init_with_defaults _init_with_defaults
_common_container_setup 'CUSTOM_SETUP_ARGUMENTS' _common_container_setup 'CUSTOM_SETUP_ARGUMENTS'
@ -36,7 +36,7 @@ function teardown() { _default_teardown ; }
--env SA_TAG=-5.0 --env SA_TAG=-5.0
--env SA_TAG2=2.0 --env SA_TAG2=2.0
--env SA_KILL=3.0 --env SA_KILL=3.0
--env SA_SPAM_SUBJECT="SPAM: " --env SPAM_SUBJECT="SPAM: "
--env VIRUSMAILS_DELETE_DELAY=7 --env VIRUSMAILS_DELETE_DELAY=7
--env ENABLE_SRS=1 --env ENABLE_SRS=1
--env ENABLE_MANAGESIEVE=1 --env ENABLE_MANAGESIEVE=1