From a1f9794dafd5bd5a001baafe08a3512128488fe1 Mon Sep 17 00:00:00 2001
From: andryyy <andre.peters@debinux.de>
Date: Wed, 1 Sep 2021 15:21:43 +0200
Subject: [PATCH] [Rspamd] Base on bullseye; remove nullnull map to _perhaps_
 prevent a memleak

---
 data/Dockerfiles/rspamd/Dockerfile     | 11 ++++++-----
 data/conf/rspamd/local.d/multimap.conf |  8 --------
 docker-compose.yml                     |  2 +-
 3 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/data/Dockerfiles/rspamd/Dockerfile b/data/Dockerfiles/rspamd/Dockerfile
index 888bdcb2..ee08f8d2 100644
--- a/data/Dockerfiles/rspamd/Dockerfile
+++ b/data/Dockerfiles/rspamd/Dockerfile
@@ -1,8 +1,8 @@
-FROM debian:buster-slim
-LABEL maintainer "Andre Peters <andre.peters@servercow.de>"
+FROM debian:bullseye-slim
+LABEL maintainer "Andre Peters <andre.peters@tinc.gmbh>"
 
 ARG DEBIAN_FRONTEND=noninteractive
-ARG CODENAME=buster
+ARG CODENAME=bullseye
 ENV LC_ALL C
 
 RUN apt-get update && apt-get install -y \
@@ -15,12 +15,13 @@ RUN apt-get update && apt-get install -y \
   && apt-key adv --fetch-keys https://rspamd.com/apt-stable/gpg.key \
   && echo "deb [arch=amd64] https://rspamd.com/apt-stable/ $CODENAME main" > /etc/apt/sources.list.d/rspamd.list \
   && apt-get update \
-  && apt-get --no-install-recommends -y install rspamd redis-tools \
+  && apt-get --no-install-recommends -y install rspamd redis-tools procps nano \
   && rm -rf /var/lib/apt/lists/* \
   && apt-get autoremove --purge \
   && apt-get clean \
   && mkdir -p /run/rspamd \
-  && chown _rspamd:_rspamd /run/rspamd
+  && chown _rspamd:_rspamd /run/rspamd \
+  && echo 'alias ll="ls -la --color"' >> ~/.bashrc
 
 COPY settings.conf /etc/rspamd/settings.conf
 COPY metadata_exporter.lua /usr/share/rspamd/plugins/metadata_exporter.lua
diff --git a/data/conf/rspamd/local.d/multimap.conf b/data/conf/rspamd/local.d/multimap.conf
index 17ada99e..2ecbccf2 100644
--- a/data/conf/rspamd/local.d/multimap.conf
+++ b/data/conf/rspamd/local.d/multimap.conf
@@ -171,11 +171,3 @@ SMTP_LIMITED_ACCESS {
   symbols_set = ["SMTP_LIMITED_ACCESS"];
 }
 
-BAD_SUBJECT_00 {
-  type = "header";
-  header = "subject";
-  regexp = true;
-  map = "http://nullnull.org/bad-subject-regex.txt";
-  score = 6.0;
-  symbols_set = ["BAD_SUBJECT_00"];
-}
diff --git a/docker-compose.yml b/docker-compose.yml
index e153d05f..9094738a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -73,7 +73,7 @@ services:
             - clamd
 
     rspamd-mailcow:
-      image: mailcow/rspamd:1.77
+      image: mailcow/rspamd:1.78
       stop_grace_period: 30s
       depends_on:
         - dovecot-mailcow