2 files changed, 11 insertions, 3 deletions
diff --git a/playbooks/roles/mail/templates/volumes/data/dms/config/dovecot-ldap.conf b/playbooks/roles/mail/templates/volumes/data/dms/config/dovecot-ldap.conf
index 956942c..6a14553 100644
--- a/playbooks/roles/mail/templates/volumes/data/dms/config/dovecot-ldap.conf
+++ b/playbooks/roles/mail/templates/volumes/data/dms/config/dovecot-ldap.conf
@@ -8,4 +8,3 @@ dnpass = {{ email_ldap_api_token }}
 
 auth_bind = yes
 auth_bind_userdn = {{ dovecot_auth_bind_userdn }}
-user_filter = {{ dovecot_user_filter }}
diff --git a/playbooks/roles/mail/templates/volumes/data/dms/config/user-patches.sh b/playbooks/roles/mail/templates/volumes/data/dms/config/user-patches.sh
index 1749499..f03bc81 100755
--- a/playbooks/roles/mail/templates/volumes/data/dms/config/user-patches.sh
+++ b/playbooks/roles/mail/templates/volumes/data/dms/config/user-patches.sh
@@ -26,6 +26,9 @@ sed -i 's/result_attribute = mail/result_attribute = emailprimary/' /etc/postfix
 sed -i 's/result_attribute = mail/result_attribute = emailprimary/' /etc/postfix/ldap-domains.cf
 sed -i 's/result_attribute = mail/result_attribute = emailprimary/' /etc/postfix/ldap-users.cf
 
+grep -q '^leaf_result_attribute = mail$' /etc/postfix/ldap-groups.cf || echo "leaf_result_attribute = mail" >> /etc/postfix/ldap-groups.cf
+grep -q '^special_result_attribute = member$' /etc/postfix/ldap-groups.cf || echo "special_result_attribute = member" >> /etc/postfix/ldap-groups.cf
+
 echo 'auth_username_format = %Ln' >> /etc/dovecot/conf.d/10-auth.conf
 
 echo 'username_format = %Ln' >> /etc/dovecot/dovecot-oauth2.conf.ext
@@ -37,6 +40,12 @@ echo "passdb {
 
 userdb {
     driver = static
-    args = username_format=%u uid=docker gid=docker home=/var/mail/%d/%u
-    default_fields = uid=docker gid=docker home=/var/mail/%d/%u
+    args = username_format=%u uid=5000 gid=5000 home=/var/mail/%u
+    default_fields = uid=5000 gid=5000 home=/var/mail/%u
 }" > /etc/dovecot/conf.d/auth-ldap.conf.ext
+
+postconf -e 'virtual_uid_maps = static:5000'
+postconf -e 'virtual_gid_maps = static:5000'
+postconf -e 'virtual_minimum_uid = 5000'
+
+chown -R 5000:5000 /var/mail/*