diff --git a/galaxy.yml b/galaxy.yml index 346697d..52b1421 100644 --- a/galaxy.yml +++ b/galaxy.yml @@ -8,7 +8,7 @@ namespace: s3lph name: mailserver # The version of the collection. Must be compatible with semantic versioning -version: '0.5.0' +version: '0.5.1' # The path to the Markdown (.md) readme file. This path is relative to the root of the collection readme: README.md diff --git a/roles/postfixadmin/templates/etc/dovecot/dovecot-sql.conf.j2 b/roles/postfixadmin/templates/etc/dovecot/dovecot-sql.conf.j2 index 10d07b3..765c3ea 100644 --- a/roles/postfixadmin/templates/etc/dovecot/dovecot-sql.conf.j2 +++ b/roles/postfixadmin/templates/etc/dovecot/dovecot-sql.conf.j2 @@ -12,8 +12,8 @@ default_pass_scheme = BLF-CRYPT # '%s'<>'smtp' permits login for inactive users, but only if the service is NOT smtp. # This permits disabled users to still read their mail, but will not allow them to send mail. password_query = SELECT username AS user,password FROM mailbox WHERE {{ user_filter }} AND ( active='1' OR '%s'<>'smtp' ) -user_query = SELECT CONCAT('{{ virtual_mail_home }}', maildir) AS home, {{ virtual_mail_numeric_uid }} AS uid, {{ virtual_mail_numeric_gid }} AS gid, CONCAT('*:bytes=', quota) AS quota_rule FROM mailbox WHERE {{ user_filter }} AND ( active='1' OR '%s'<>'smtp' ) +user_query = SELECT CONCAT('{{ virtual_mail_home }}/', maildir) AS home, {{ virtual_mail_numeric_uid }} AS uid, {{ virtual_mail_numeric_gid }} AS gid, CONCAT('*:bytes=', quota) AS quota_rule FROM mailbox WHERE {{ user_filter }} AND ( active='1' OR '%s'<>'smtp' ) {% else %} password_query = SELECT username AS user,password FROM mailbox WHERE {{ user_filter }} AND active='1' -user_query = SELECT CONCAT('{{ virtual_mail_home }}', maildir) AS home, {{ virtual_mail_numeric_uid }} AS uid, {{ virtual_mail_numeric_gid }} AS gid, CONCAT('*:bytes=', quota) AS quota_rule FROM mailbox WHERE {{ user_filter }} AND active='1' +user_query = SELECT CONCAT('{{ virtual_mail_home }}/', maildir) AS home, {{ virtual_mail_numeric_uid }} AS uid, {{ virtual_mail_numeric_gid }} AS gid, CONCAT('*:bytes=', quota) AS quota_rule FROM mailbox WHERE {{ user_filter }} AND active='1' {% endif %} \ No newline at end of file