From ccf1852026830af67353e143a5375cc14d28e001 Mon Sep 17 00:00:00 2001
From: Alex Palaistras <alex@deuill.org>
Date: Sun, 13 Aug 2023 16:30:55 +0100
Subject: [PATCH] dovecot: Update to version 2.3.19, move to Quadlet

---
 service/dovecot/Containerfile             |  4 ++--
 service/dovecot/quadlet/dovecot.container | 25 ++++++++++++++++++++++
 service/dovecot/spec.bu                   |  4 ++--
 service/dovecot/systemd/dovecot.service   | 26 -----------------------
 4 files changed, 29 insertions(+), 30 deletions(-)
 create mode 100644 service/dovecot/quadlet/dovecot.container
 delete mode 100644 service/dovecot/systemd/dovecot.service

diff --git a/service/dovecot/Containerfile b/service/dovecot/Containerfile
index 3b992e1..22929dd 100644
--- a/service/dovecot/Containerfile
+++ b/service/dovecot/Containerfile
@@ -1,5 +1,5 @@
-FROM docker.io/debian:bullseye-slim
-ARG VERSION=2.3.13
+FROM docker.io/debian:bookworm-slim
+ARG VERSION=2.3.19
 
 RUN apt-get update -y && apt-get install -y --no-install-recommends \
     dovecot-imapd=1:${VERSION}* dovecot-lmtpd=1:${VERSION}* dovecot-mysql=1:${VERSION}* \
diff --git a/service/dovecot/quadlet/dovecot.container b/service/dovecot/quadlet/dovecot.container
new file mode 100644
index 0000000..854129d3
--- /dev/null
+++ b/service/dovecot/quadlet/dovecot.container
@@ -0,0 +1,25 @@
+[Unit]
+Description=Dovecot POP3/IMAP server
+Wants=container-build@%N.service container-volume@%N.service mariadb.service rspamd.service grafana-dashboard@dovecot.service
+After=container-build@%N.service container-volume@%N.service mariadb.service rspamd.service
+Before=grafana-dashboard@dovecot.service
+
+[Container]
+AddCapability=SYS_CHROOT
+ContainerName=%N
+EnvironmentFile=%E/coreos-home-server/%N/%N.env
+EnvironmentFile=%E/coreos-home-server/rspamd/rspamd.env
+Image=localhost/%N:latest
+Network=internal
+PublishPort=143:143
+PublishPort=993:993
+PublishPort=4190:4190
+Volume=%N:/var/mail:z
+Volume=letsencrypt:/etc/ssl/private:z,ro
+
+[Service]
+ExecReload=/bin/podman exec %N doveadm -v reload
+Restart=on-failure
+
+[Install]
+WantedBy=multi-user.target
diff --git a/service/dovecot/spec.bu b/service/dovecot/spec.bu
index 9269192..0f787d3 100644
--- a/service/dovecot/spec.bu
+++ b/service/dovecot/spec.bu
@@ -6,11 +6,11 @@ storage:
       local: service/dovecot/
     - path: /etc/systemd/system
       local: service/dovecot/systemd/
+    - path: /etc/containers/systemd
+      local: service/dovecot/quadlet/
 systemd:
   units:
     - name: dovecot-firstboot.target
       enabled: true
     - name: dovecot-fts-optimize.timer
       enabled: true
-    - name: dovecot.service
-      enabled: true
diff --git a/service/dovecot/systemd/dovecot.service b/service/dovecot/systemd/dovecot.service
deleted file mode 100644
index 48e5f53..0000000
--- a/service/dovecot/systemd/dovecot.service
+++ /dev/null
@@ -1,26 +0,0 @@
-[Unit]
-Description=Dovecot POP3/IMAP Server
-Wants=container-build@%N.service container-volume@%N.service mariadb.service rspamd.service grafana-dashboard@dovecot.service
-After=container-build@%N.service container-volume@%N.service mariadb.service rspamd.service
-Before=grafana-dashboard@dovecot.service
-
-[Service]
-Type=notify
-NotifyAccess=all
-SyslogIdentifier=%N
-Restart=on-failure
-Environment=PODMAN_SYSTEMD_UNIT=%n
-ExecStart=/bin/podman run --replace --name %N --net internal --sdnotify=conmon \
-                          --cap-add SYS_CHROOT \
-                          --env-file %E/coreos-home-server/%N/%N.env \
-                          --env-file %E/coreos-home-server/rspamd/rspamd.env \
-                          --publish 143:143 --publish 993:993 --publish 4190:4190 \
-                          --volume %N:/var/mail:z \
-                          --volume letsencrypt:/etc/ssl/private:z,ro \
-                          localhost/%N:latest
-ExecStop=/bin/podman stop --ignore --time 10 %N
-ExecStopPost=/bin/podman rm --ignore --force %N
-ExecReload=/bin/podman exec %N doveadm -v reload
-
-[Install]
-WantedBy=multi-user.target