aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStonewall Jackson <stonewall@sacredheartsc.com>2024-02-19 04:58:38 -0500
committerStonewall Jackson <stonewall@sacredheartsc.com>2024-02-19 04:58:38 -0500
commit83b95fabb330e6d45f0d33348a2a6fc7aad82089 (patch)
treec8b5661b6f06fb38a6d73dcc9818fa270be51565
parentddbb22c8cb78bd72192378e95fb724c0a8fb14b8 (diff)
downloadselfhosted-master.tar.gz
selfhosted-master.zip
fix dovecot archive jobHEADmaster
-rw-r--r--playbooks/mail.yml1
-rw-r--r--roles/dovecot/templates/usr/local/bin/dovecot-archive.sh.j24
2 files changed, 4 insertions, 1 deletions
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)