From 7733844722ae695136a455daa441fe0c0b26e1e6 Mon Sep 17 00:00:00 2001
From: Dmitriy Alekseev <1865999+dragoangel@users.noreply.github.com>
Date: Tue, 30 Dec 2025 00:27:45 +0100
Subject: [PATCH 1/3] [Rspamd] Do not try scanning eml with clamav when it's
 off

---
 data/conf/rspamd/local.d/antivirus.conf | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/data/conf/rspamd/local.d/antivirus.conf b/data/conf/rspamd/local.d/antivirus.conf
index c8d31d1e3..e2a6a1660 100644
--- a/data/conf/rspamd/local.d/antivirus.conf
+++ b/data/conf/rspamd/local.d/antivirus.conf
@@ -1,3 +1,4 @@
+{% if env.SKIP_CLAMD == "n" %}
 clamav {
   # Scan whole message
   scan_mime_parts = false;
@@ -9,3 +10,4 @@ clamav {
   servers = "clamd:3310";
   max_size = 20971520;
 }
+{% endif %}

From 8834d041461c708bf048574159fe9dd13e3c55f4 Mon Sep 17 00:00:00 2001
From: Dmitriy Alekseev <1865999+dragoangel@users.noreply.github.com>
Date: Tue, 30 Dec 2025 00:28:48 +0100
Subject: [PATCH 2/3] Add RSPAMD_SKIP_CLAMD environment variable

---
 docker-compose.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docker-compose.yml b/docker-compose.yml
index f09afca2a..f5065384e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -97,6 +97,7 @@ services:
         - REDIS_SLAVEOF_PORT=${REDIS_SLAVEOF_PORT:-}
         - REDISPASS=${REDISPASS}
         - SPAMHAUS_DQS_KEY=${SPAMHAUS_DQS_KEY:-}
+        - RSPAMD_SKIP_CLAMD=${SKIP_CLAMD:-n}
       volumes:
         - ./data/hooks/rspamd:/hooks:Z
         - ./data/conf/rspamd/custom/:/etc/rspamd/custom:z

From ab862d4a822cc636bd7e9dcdf6da3936e2d83765 Mon Sep 17 00:00:00 2001
From: Dmitriy Alekseev <1865999+dragoangel@users.noreply.github.com>
Date: Tue, 30 Dec 2025 00:46:53 +0100
Subject: [PATCH 3/3] Update antivirus.conf to check for 'no' in SKIP_CLAMD

---
 data/conf/rspamd/local.d/antivirus.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/conf/rspamd/local.d/antivirus.conf b/data/conf/rspamd/local.d/antivirus.conf
index e2a6a1660..64bb3b600 100644
--- a/data/conf/rspamd/local.d/antivirus.conf
+++ b/data/conf/rspamd/local.d/antivirus.conf
@@ -1,4 +1,4 @@
-{% if env.SKIP_CLAMD == "n" %}
+{%- if env.SKIP_CLAMD == "n" or env.SKIP_CLAMD == "no" -%}
 clamav {
   # Scan whole message
   scan_mime_parts = false;