[Rspamd] Base on bullseye; remove nullnull map to _perhaps_ prevent a memleak
parent
853a281993
commit
8ee997b1a3
|
@ -1,8 +1,8 @@
|
||||||
FROM debian:buster-slim
|
FROM debian:bullseye-slim
|
||||||
LABEL maintainer "Andre Peters <andre.peters@servercow.de>"
|
LABEL maintainer "Andre Peters <andre.peters@tinc.gmbh>"
|
||||||
|
|
||||||
ARG DEBIAN_FRONTEND=noninteractive
|
ARG DEBIAN_FRONTEND=noninteractive
|
||||||
ARG CODENAME=buster
|
ARG CODENAME=bullseye
|
||||||
ENV LC_ALL C
|
ENV LC_ALL C
|
||||||
|
|
||||||
RUN apt-get update && apt-get install -y \
|
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 \
|
&& 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 \
|
&& echo "deb [arch=amd64] https://rspamd.com/apt-stable/ $CODENAME main" > /etc/apt/sources.list.d/rspamd.list \
|
||||||
&& apt-get update \
|
&& 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/* \
|
&& rm -rf /var/lib/apt/lists/* \
|
||||||
&& apt-get autoremove --purge \
|
&& apt-get autoremove --purge \
|
||||||
&& apt-get clean \
|
&& apt-get clean \
|
||||||
&& mkdir -p /run/rspamd \
|
&& 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 settings.conf /etc/rspamd/settings.conf
|
||||||
COPY metadata_exporter.lua /usr/share/rspamd/plugins/metadata_exporter.lua
|
COPY metadata_exporter.lua /usr/share/rspamd/plugins/metadata_exporter.lua
|
||||||
|
|
|
@ -171,11 +171,3 @@ SMTP_LIMITED_ACCESS {
|
||||||
symbols_set = ["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"];
|
|
||||||
}
|
|
||||||
|
|
|
@ -73,7 +73,7 @@ services:
|
||||||
- clamd
|
- clamd
|
||||||
|
|
||||||
rspamd-mailcow:
|
rspamd-mailcow:
|
||||||
image: mailcow/rspamd:1.77
|
image: mailcow/rspamd:1.78
|
||||||
stop_grace_period: 30s
|
stop_grace_period: 30s
|
||||||
depends_on:
|
depends_on:
|
||||||
- dovecot-mailcow
|
- dovecot-mailcow
|
||||||
|
|
Loading…
Reference in New Issue