From 30bd9d63cfbc6dc4f304f2138b85ed523b07e9a5 Mon Sep 17 00:00:00 2001
From: Jakub Czajka <jakub@ekhem.eu.org>
Date: Tue, 17 Oct 2023 03:23:29 +0200
Subject: [PATCH] Restore email directory.

---
 server/dovecot.yaml | 11 ++++++++++-
 sources.yaml        |  5 +++++
 users.yaml          |  8 ++++++--
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/server/dovecot.yaml b/server/dovecot.yaml
index 550ad60..6423dd0 100644
--- a/server/dovecot.yaml
+++ b/server/dovecot.yaml
@@ -59,7 +59,16 @@
     - 90-acl.conf
     - auth-deny.conf.ext
     - auth-sql.conf.ext
-- name: Ensure virtual mailbox exists
+- name: Ensure correct permissions for the virtual mailbox
+  file:
+    path: "/var/vmail"
+    state: directory
+    mode: "0775"
+    owner: vmail
+    group: storage
+    recurse: true
+  become: true
+- name: Ensure configuration of the virtual mailbox user
   user:
     name: "vmail"
     home: "/var/vmail"
diff --git a/sources.yaml b/sources.yaml
index 3592d12..de1946e 100644
--- a/sources.yaml
+++ b/sources.yaml
@@ -89,6 +89,11 @@ files:
     dest: "/srv/git"
     owner: "git"
     group: "www-data"
+  - name: "vmail"
+    uid: "1yIQJNczXX-YDPG7ws5CUYDs758AmOytJ"
+    dest: "/var"
+    owner: "vmail"
+    group: "vmail"
   - name: "website.git"
     uid: "13RqrCYU0M-QcN-NWFEuSjPB8eNhTAWT3"
     dest: "/srv/git"
diff --git a/users.yaml b/users.yaml
index 16081f5..84fdfcd 100644
--- a/users.yaml
+++ b/users.yaml
@@ -26,7 +26,11 @@
         name: "git"
         shell: "/usr/bin/git-shell"
       become: yes
-    - name: Ensure user opendkim exists
+    - name: Ensure existance of the {{ item }} user
       user:
-        name: "opendkim"
+        name: "{{ item }}"
       become: yes
+      with_items:
+        - opendkim
+        - vmail
+        - storage
-- 
2.39.5