From c081adf0b0e33971f8c368dbaeec16335f79c4c7 Mon Sep 17 00:00:00 2001 From: Alex Palaistras Date: Sun, 17 Apr 2022 12:52:23 +0100 Subject: [PATCH] rspamd: Update to version 3.2 We also return generated DKIM keys to standard output when the `rspamd-dkim-generate` service is used. --- service/rspamd/Containerfile | 2 +- service/rspamd/systemd/rspamd-dkim-generate@.service | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/service/rspamd/Containerfile b/service/rspamd/Containerfile index 8be83c4..18b6f84 100644 --- a/service/rspamd/Containerfile +++ b/service/rspamd/Containerfile @@ -1,5 +1,5 @@ FROM docker.io/debian:bullseye-slim -ARG VERSION=3.1 +ARG VERSION=3.2 RUN apt-get update -y && apt-get install -y --no-install-recommends \ ca-certificates curl gnupg diff --git a/service/rspamd/systemd/rspamd-dkim-generate@.service b/service/rspamd/systemd/rspamd-dkim-generate@.service index 78293b9..0d0ccb6 100644 --- a/service/rspamd/systemd/rspamd-dkim-generate@.service +++ b/service/rspamd/systemd/rspamd-dkim-generate@.service @@ -6,10 +6,11 @@ After=rspamd.service [Service] Type=oneshot SyslogIdentifier=%N +StandardOutput=tty ExecStartPre=/bin/podman exec rspamd install -d /var/lib/rspamd/dkim ExecStart=/bin/podman exec rspamd openssl genrsa -out /var/lib/rspamd/dkim/%i.dkim.key 1024 ExecStartPost=/bin/podman exec rspamd chmod 644 /var/lib/rspamd/dkim/%i.dkim.key -ExecStartPost=/bin/podman exec rspamd sh -c 'echo "Public DKIM key:"; openssl rsa -in /var/lib/rspamd/dkim/%i.dkim.key -pubout -outform der 2> /dev/null | openssl base64 -A' +ExecStartPost=/bin/podman exec rspamd sh -c 'echo "Public DKIM key:"; openssl rsa -in /var/lib/rspamd/dkim/%i.dkim.key -pubout -outform der 2> /dev/null | openssl base64 -A; echo' [Install] WantedBy=multi-user.target