From f0c222d61b857a7d169b1ceaea785defd2fbf52b Mon Sep 17 00:00:00 2001
From: casperklein <casperklein@users.noreply.github.com>
Date: Sat, 16 Mar 2024 21:04:02 +0100
Subject: [PATCH] Enable spamassassin only, when amavis is enabled.

---
 target/scripts/startup/setup.d/security/misc.sh | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/target/scripts/startup/setup.d/security/misc.sh b/target/scripts/startup/setup.d/security/misc.sh
index bb460716..444589df 100644
--- a/target/scripts/startup/setup.d/security/misc.sh
+++ b/target/scripts/startup/setup.d/security/misc.sh
@@ -67,6 +67,11 @@ function __setup__security__postscreen() {
 }
 
 function __setup__security__spamassassin() {
+  if [[ ${ENABLE_AMAVIS} -ne 1 && ${ENABLE_SPAMASSASSIN} -eq 1 ]]; then
+    _log 'warn' 'Spamassassin does not work when Amavis is disabled. Enable Amavis to fix it.'
+    ENABLE_SPAMASSASSIN=0
+  fi
+
   if [[ ${ENABLE_SPAMASSASSIN} -eq 1 ]]; then
     _log 'debug' 'Enabling and configuring SpamAssassin'
 
@@ -240,10 +245,6 @@ function __setup__security__amavis() {
     if [[ ${ENABLE_CLAMAV} -eq 1 ]] && [[ ${ENABLE_RSPAMD} -eq 0 ]]; then
       _log 'warn' 'ClamAV will not work when Amavis & rspamd are disabled. Enable either Amavis or rspamd to fix it.'
     fi
-
-    if [[ ${ENABLE_SPAMASSASSIN} -eq 1 ]]; then
-      _log 'warn' 'Spamassassin will not work when Amavis is disabled. Enable Amavis to fix it.'
-    fi
   fi
 }