From a2a25e2ea41a4ee24440638c754966a56f8ca958 Mon Sep 17 00:00:00 2001
From: Quentin Dufour <quentin@deuxfleurs.fr>
Date: Tue, 14 Sep 2021 11:33:29 +0200
Subject: [PATCH] Use `cn` instead of `mail` to store emails

---
 app/email/config/dovecot/dovecot-ldap.conf.tpl | 2 +-
 app/email/deploy/email.hcl                     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/email/config/dovecot/dovecot-ldap.conf.tpl b/app/email/config/dovecot/dovecot-ldap.conf.tpl
index 9fb1ea6..a8bd72a 100644
--- a/app/email/config/dovecot/dovecot-ldap.conf.tpl
+++ b/app/email/config/dovecot/dovecot-ldap.conf.tpl
@@ -5,4 +5,4 @@ base = dc=deuxfleurs,dc=fr
 scope = subtree
 user_filter = (&(mail=%u)(&(objectClass=inetOrgPerson)(memberOf=cn=email,ou=groups,dc=deuxfleurs,dc=fr)))
 pass_filter = (&(mail=%u)(&(objectClass=inetOrgPerson)(memberOf=cn=email,ou=groups,dc=deuxfleurs,dc=fr)))
-user_attrs = mail=/var/mail/%{ldap:mail}
+user_attrs = mail=/var/mail/%{ldap:cn}
diff --git a/app/email/deploy/email.hcl b/app/email/deploy/email.hcl
index 6b0e9c5..d3dab3d 100644
--- a/app/email/deploy/email.hcl
+++ b/app/email/deploy/email.hcl
@@ -37,7 +37,7 @@ job "email" {
         volumes = [
           "secrets/ssl/certs:/etc/ssl/certs",
           "secrets/ssl/private:/etc/ssl/private",
-	        "secrets/conf/dovecot-ldap.conf:/etc/dovecot/dovecot-ldap.conf",
+          "secrets/conf/dovecot-ldap.conf:/etc/dovecot/dovecot-ldap.conf",
           "/mnt/glusterfs/email/mail:/var/mail/",
         ]
       }