From 772bce8c0b0150e7a8c4bf32314d5653148f7142 Mon Sep 17 00:00:00 2001
From: Jeremy Lecour <jlecour@evolix.fr>
Date: Mon, 7 Dec 2020 17:26:45 +0100
Subject: [PATCH] dovecot: vmail uid/gid are configurable

---
 CHANGELOG.md              | 1 +
 dovecot/defaults/main.yml | 4 +++-
 dovecot/tasks/main.yml    | 4 ++--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f2ce2a6e..f2d562e7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@ The **patch** part changes incrementally at each release.
 ### Added
 
 * dovecot: Update munin plugin & configure it
+* dovecot: vmail uid/gid are configurable
 * evoacme: variable to disable Debian version check (default: False)
 * kvm-host: Add drbd role dependency (toggleable with kvm_install_drbd)
 * minifirewall: upstream release 20.12
diff --git a/dovecot/defaults/main.yml b/dovecot/defaults/main.yml
index 884bc1ca..52e06bda 100644
--- a/dovecot/defaults/main.yml
+++ b/dovecot/defaults/main.yml
@@ -1,2 +1,4 @@
 ---
-dovecot_foo: bar
+
+dovecot_vmail_uid: 5000
+dovecot_vmail_gid: 5000
diff --git a/dovecot/tasks/main.yml b/dovecot/tasks/main.yml
index 8492e00a..8508a902 100644
--- a/dovecot/tasks/main.yml
+++ b/dovecot/tasks/main.yml
@@ -40,7 +40,7 @@
 - name: create vmail group
   group:
     name: vmail
-    gid: 5000
+    gid: "{{ dovecot_vmail_gid }}"
   tags:
   - dovecot
 
@@ -48,7 +48,7 @@
   user:
     name: vmail
     group: vmail
-    uid: 5000
+    uid: "{{ dovecot_vmail_uid }}"
     shell: /bin/false
   tags:
   - dovecot