From: Ralf Jung <post@ralfj.de>
Date: Mon, 3 Jun 2019 17:51:00 +0000 (+0200)
Subject: dovecot: dont override settings with their default needlessly
X-Git-Url: https://git.ralfj.de/ansible.git/commitdiff_plain/3581fab8b059d4d89e05de84c8425e340bdf0d8b

dovecot: dont override settings with their default needlessly
---

diff --git a/roles/email/templates/dovecot/dovecot-sql.conf.ext b/roles/email/templates/dovecot/dovecot-sql.conf.ext
index bbd9378..87f40ff 100644
--- a/roles/email/templates/dovecot/dovecot-sql.conf.ext
+++ b/roles/email/templates/dovecot/dovecot-sql.conf.ext
@@ -127,7 +127,8 @@ default_pass_scheme = SSHA
 #user_query = \
 #  SELECT home, uid, gid \
 #  FROM users WHERE username = '%n' AND domain = '%d'
-user_query = SELECT '/var/vmail/%u' as home, 'maildir:~/mail' as mail, {{postfix.dovecot.vmail_uid}} AS uid, {{postfix.dovecot.mail_gid}} AS gid FROM users WHERE username = '%u' AND active = '1'
+user_query = SELECT '/var/vmail/%u' as home \
+    FROM users WHERE username = '%u' AND active = '1'
 
 # If you wish to avoid two SQL lookups (passdb + userdb), you can use
 # userdb prefetch instead of userdb sql in dovecot.conf. In that case you'll
@@ -137,7 +138,7 @@ user_query = SELECT '/var/vmail/%u' as home, 'maildir:~/mail' as mail, {{postfix
 #  SELECT userid AS user, password, \
 #    home AS userdb_home, uid AS userdb_uid, gid AS userdb_gid \
 #  FROM users WHERE userid = '%u'
-password_query = SELECT username as user, password, '/var/vmail/%u' as userdb_home, 'maildir:~/mail' as userdb_mail, {{postfix.dovecot.vmail_uid}} as userdb_uid, {{postfix.dovecot.mail_gid}} as userdb_gid \
+password_query = SELECT username as user, password as password, '/var/vmail/%u' as userdb_home \
     FROM users WHERE username = '%u' AND active = '1'
 
 # Query to get a list of all usernames.