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