From b81e2b526f0541769614f06d7feb635b3c59751f Mon Sep 17 00:00:00 2001
From: Georg Lauterbach <44545919+georglauterbach@users.noreply.github.com>
Date: Sat, 28 Mar 2026 20:22:51 +0100
Subject: [PATCH] fix: remove `expand_keys = true` from Rspamd configuration
 (#4689)

---
 CHANGELOG.md                                         | 1 +
 docs/content/config/environment.md                   | 1 -
 target/scripts/startup/setup.d/security/rspamd.sh    | 1 -
 test/tests/parallel/set1/spam_virus/rspamd_full.bats | 1 -
 4 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f8239721..ec0af102 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ All notable changes to this project will be documented in this file. The format
 
 - **Rspamd:**
   - Configuration changes now trigger a service reload instead of a restart ([#4632](https://github.com/docker-mailserver/docker-mailserver/pull/4632))
+  - `expand_keys = true` has been removed from the Redis configuration ([#4689](https://github.com/docker-mailserver/docker-mailserver/pull/4689))
 - **Internal:**
   - `ENABLE_QUOTAS=1` - When an alias has multiple addresses, the first local mailbox address found will be used for the Dovecot dummy account workaround ([#4581](https://github.com/docker-mailserver/docker-mailserver/pull/4581))
   - Change Detection service - Added support for responding to updated DMS config (_Rspamd and TLS certificates_) to `ACCOUNT_PROVISIONER=LDAP` ([#4627](https://github.com/docker-mailserver/docker-mailserver/pull/4627))
diff --git a/docs/content/config/environment.md b/docs/content/config/environment.md
index 67b0b4b6..3b9b73ca 100644
--- a/docs/content/config/environment.md
+++ b/docs/content/config/environment.md
@@ -428,7 +428,6 @@ The purpose of this setting is to opt-out of starting an internal Redis instance
 
     ```
     servers = "redis.example.test:6379";
-    expand_keys = true;
     ```
 
 [rspamd-redis-config]: https://rspamd.com/doc/configuration/redis.html
diff --git a/target/scripts/startup/setup.d/security/rspamd.sh b/target/scripts/startup/setup.d/security/rspamd.sh
index bc2e936f..7651b8ab 100644
--- a/target/scripts/startup/setup.d/security/rspamd.sh
+++ b/target/scripts/startup/setup.d/security/rspamd.sh
@@ -125,7 +125,6 @@ function __rspamd__setup_redis() {
 # documentation: https://rspamd.com/doc/configuration/redis.html
 
 servers = "127.0.0.1:6379";
-expand_keys = true;
 
 EOF
 
diff --git a/test/tests/parallel/set1/spam_virus/rspamd_full.bats b/test/tests/parallel/set1/spam_virus/rspamd_full.bats
index e5c63c6e..276b4c7a 100644
--- a/test/tests/parallel/set1/spam_virus/rspamd_full.bats
+++ b/test/tests/parallel/set1/spam_virus/rspamd_full.bats
@@ -92,7 +92,6 @@ function teardown_file() { _default_teardown ; }
 @test 'Rspamd Redis configuration is correct' {
   _run_in_container rspamadm configdump redis
   assert_success
-  assert_line 'expand_keys = true;'
   assert_line 'servers = "127.0.0.1:6379";'
 
   _run_in_container rspamadm configdump history_redis