Commit bdb6cbd6 authored by Dom Sekotill's avatar Dom Sekotill
Browse files

Fix & simplify dovecot mail_location & mail_[ug]id

parent 719ba5a2

conf.d/10-docker-image.conf

+5 −1
Original line number Diff line number Diff line
@@ -12,7 +12,11 @@ ssl_key = </etc/tls/tls.key 


# The mail volume is mounted to /var/mail, indexes at /var/indexes

mail_home = /var/mail/%d/%n

mail_location = maildir:~/:INBOX=~/.INBOX:INDEX=/var/indexes/%d/%n:ITERINDEX=:UTF-8=

mail_location = maildir:~/mail:INBOX=~/mail/.INBOX:INDEX=/var/indexes/%d/%n:ITERINDEX=:UTF-8=



# The UID/GID of all virtual users

mail_uid = 5000

mail_gid = 5000



# The default user accounts used for running daemons under Debian

# These may need changing or extra support in the image if a different base

conf.d/sql-site.conf.ext

+3 −3
Original line number Diff line number Diff line
@@ -6,11 +6,11 @@ default_pass_scheme = SHA256 
password_query = \

	SELECT \

	  REPLACE(password, 'sha256_unsalted$', '') as password, \

	  5000 AS uid, \

	  5000 AS gid, \

	  CONCAT('/var/mail/virtual/', mailbox) AS mail \

	  CONCAT('/var/mail/virtual/', mailbox) AS userdb_mail \

	FROM users \

	WHERE \

	  username = '%u'



# userdb_mail needs removal with a data migration



user_query = SELECT 5000 as uid, 5000 as gid FROM users WHERE username = '%u'