From 83b95fabb330e6d45f0d33348a2a6fc7aad82089 Mon Sep 17 00:00:00 2001
From: Stonewall Jackson <stonewall@sacredheartsc.com>
Date: Mon, 19 Feb 2024 04:58:38 -0500
Subject: fix dovecot archive job

---
 playbooks/mail.yml                                          | 1 +
 roles/dovecot/templates/usr/local/bin/dovecot-archive.sh.j2 | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/playbooks/mail.yml b/playbooks/mail.yml
index b34bc48..cd64ded 100644
--- a/playbooks/mail.yml
+++ b/playbooks/mail.yml
@@ -34,5 +34,6 @@
 
     - role: archive_job
       archive_name: dovecot
+      archive_group: '{{ dovecot_vmail_user }}'
       archive_command: '{{ dovecot_archive_script }}'
       tags: archive
diff --git a/roles/dovecot/templates/usr/local/bin/dovecot-archive.sh.j2 b/roles/dovecot/templates/usr/local/bin/dovecot-archive.sh.j2
index 8f34b6a..fa7bd85 100644
--- a/roles/dovecot/templates/usr/local/bin/dovecot-archive.sh.j2
+++ b/roles/dovecot/templates/usr/local/bin/dovecot-archive.sh.j2
@@ -8,8 +8,10 @@ TMPDIR=$(mktemp -d .dovecot-XXXXXX)
 trap 'rm -rf -- "$TMPDIR"' EXIT
 
 chown "$VMAIL_USER" "$TMPDIR"
+chgrp "$VMAIL_USER" "$TMPDIR"
+chmod 770 "$TMPDIR"
 
-doveadm user '*' | xargs -r -I{} doveadm -o plugin/quota= backup -n inbox -f -u {} "mdbox:${TMPDIR}/{}/mdbox:LAYOUT=fs"
+doveadm user '*' | xargs -r -I{} doveadm -o plugin/quota= backup -n inbox -f -u {} "mdbox:$(readlink -f "$TMPDIR")/{}/mdbox:LAYOUT=fs"
 
 TIMESTAMP=$(date +%Y%m%d%H%M%S)
 
-- 
cgit