From fe58316776138cb5dee9c351c8dfe3f1d7639ad5 Mon Sep 17 00:00:00 2001
From: Florent Daigniere <nextgens@freenetproject.org>
Date: Mon, 1 Nov 2021 14:13:58 +0100
Subject: [PATCH 1/2] The DKIM folder isn't required for rspamd

---
 setup/flavors/compose/docker-compose.yml | 1 -
 setup/flavors/stack/docker-compose.yml   | 1 -
 2 files changed, 2 deletions(-)

diff --git a/setup/flavors/compose/docker-compose.yml b/setup/flavors/compose/docker-compose.yml
index 08bba13b..2675a2ab 100644
--- a/setup/flavors/compose/docker-compose.yml
+++ b/setup/flavors/compose/docker-compose.yml
@@ -90,7 +90,6 @@ services:
     env_file: {{ env }}
     volumes:
       - "{{ root }}/filter:/var/lib/rspamd"
-      - "{{ root }}/dkim:/dkim:ro"
       - "{{ root }}/overrides/rspamd:/etc/rspamd/override.d:ro"
     depends_on:
       - front
diff --git a/setup/flavors/stack/docker-compose.yml b/setup/flavors/stack/docker-compose.yml
index df1fe7b4..24afa9f3 100644
--- a/setup/flavors/stack/docker-compose.yml
+++ b/setup/flavors/stack/docker-compose.yml
@@ -74,7 +74,6 @@ services:
     env_file: {{ env }}
     volumes:
       - "{{ root }}/filter:/var/lib/rspamd"
-      - "{{ root }}/dkim:/dkim:ro"
       - "{{ root }}/overrides/rspamd:/etc/rspamd/override.d:ro"
     deploy:
       replicas: 1

From 74b31dc407432736ddb1d858160b00e401f02198 Mon Sep 17 00:00:00 2001
From: Florent Daigniere <nextgens@freenetproject.org>
Date: Mon, 1 Nov 2021 17:52:12 +0100
Subject: [PATCH 2/2] Ensure that RCVD_NO_TLS_LAST doesn't add spam points

---
 core/rspamd/conf/settings.conf           | 4 ++++
 towncrier/newsfragments/1705.enhancement | 1 +
 2 files changed, 5 insertions(+)
 create mode 100644 core/rspamd/conf/settings.conf
 create mode 100644 towncrier/newsfragments/1705.enhancement

diff --git a/core/rspamd/conf/settings.conf b/core/rspamd/conf/settings.conf
new file mode 100644
index 00000000..01e9780f
--- /dev/null
+++ b/core/rspamd/conf/settings.conf
@@ -0,0 +1,4 @@
+apply {
+	# see https://github.com/Mailu/Mailu/issues/1705
+	RCVD_NO_TLS_LAST = 0;
+}
diff --git a/towncrier/newsfragments/1705.enhancement b/towncrier/newsfragments/1705.enhancement
new file mode 100644
index 00000000..9a6cb11a
--- /dev/null
+++ b/towncrier/newsfragments/1705.enhancement
@@ -0,0 +1 @@
+Ensure that RCVD_NO_TLS_LAST doesn't add to the spam score (as TLS usage can't be determined)