From 8998e21f7b20720eea454fd3f7482c5236611967 Mon Sep 17 00:00:00 2001
From: Dimitri Huisman <diman@huisman.xyz>
Date: Tue, 29 Jun 2021 07:59:24 +0000
Subject: [PATCH 1/2] Set static hostname for antispam to preserve history. See
 #561

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

diff --git a/setup/flavors/compose/docker-compose.yml b/setup/flavors/compose/docker-compose.yml
index 155e1180..08bba13b 100644
--- a/setup/flavors/compose/docker-compose.yml
+++ b/setup/flavors/compose/docker-compose.yml
@@ -85,6 +85,7 @@ services:
 
   antispam:
     image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}rspamd:${MAILU_VERSION:-{{ version }}}
+    hostname: antispam
     restart: always
     env_file: {{ env }}
     volumes:
diff --git a/setup/flavors/stack/docker-compose.yml b/setup/flavors/stack/docker-compose.yml
index d9c5cd4f..df1fe7b4 100644
--- a/setup/flavors/stack/docker-compose.yml
+++ b/setup/flavors/stack/docker-compose.yml
@@ -70,6 +70,7 @@ services:
 
   antispam:
     image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}rspamd:${MAILU_VERSION:-{{ version }}}
+    hostname: antispam
     env_file: {{ env }}
     volumes:
       - "{{ root }}/filter:/var/lib/rspamd"

From ef5741ef8053deca23e9d0410453623638a7de5f Mon Sep 17 00:00:00 2001
From: Dimitri Huisman <diman@huisman.xyz>
Date: Tue, 29 Jun 2021 08:07:43 +0000
Subject: [PATCH 2/2] Add newsfragment

---
 towncrier/newsfragments/1837.bugfix | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 towncrier/newsfragments/1837.bugfix

diff --git a/towncrier/newsfragments/1837.bugfix b/towncrier/newsfragments/1837.bugfix
new file mode 100644
index 00000000..dcabcc6b
--- /dev/null
+++ b/towncrier/newsfragments/1837.bugfix
@@ -0,0 +1 @@
+Antispam service now uses a static hostname. Rspamd history is only retained when the service has a fixed hostname.