wip

bundles/dovecot/files/dovecot-sql.conf

@@ -1,5 +1,17 @@
 connect = host=${host} dbname=${name} user=${user} password=${password}
 driver = pgsql
-default_pass_scheme = MD5-CRYPT
-password_query = SELECT username as user, password FROM mailbox WHERE username = '%u' AND active = true
-user_query = SELECT '/var/mail/vmail/' || maildir as home, 65534 as uid, 65534 as gid FROM mailbox WHERE username = '%u' AND active = true
+default_pass_scheme = PLAIN-MD5
+
+password_query = SELECT CONCAT(users.name, '@', domains.name) AS user, password\
+  FROM users \
+  LEFT JOIN domains ON users.domain_id = domains.id \
+  WHERE redirect IS NULL \
+  AND users.name = SPLIT_PART('%u', '@', 1) \
+  AND domains.name = SPLIT_PART('%u', '@', 2)
+
+user_query = SELECT CONCAT(users.name, '@', domains.name) AS user, '/var/vmail/%u' AS home \
+  FROM users \
+  LEFT JOIN domains ON users.domain_id = domains.id \
+  WHERE redirect IS NULL \
+  AND users.name = SPLIT_PART('%u', '@', 1) \
+  AND domains.name = SPLIT_PART('%u', '@', 2)

bundles/dovecot/files/dovecot.conf

@@ -39,7 +39,6 @@ ssl_prefer_server_ciphers = yes
 
 login_greeting = IMAPd ready
 auth_mechanisms = plain login
-first_valid_uid = 65534
 disable_plaintext_auth = yes
 mail_plugins = $mail_plugins zlib
 
@@ -48,8 +47,8 @@ plugin {
    zlib_save = gz
 
    sieve_plugins = sieve_imapsieve sieve_extprograms
-   sieve_dir = /var/vmail/sieve/%d/%n/
-   sieve = /var/vmail/sieve/%d/%n.sieve
+   sieve_dir = /var/vmail/sieve/%u/
+   sieve = /var/vmail/sieve/%u.sieve
    sieve_pipe_bin_dir = /var/vmail/sieve/bin
    sieve_extensions = +vnd.dovecot.pipe
 
@@ -133,7 +132,7 @@ protocol imap {
 
 protocol sieve {
    plugin {
-       sieve = /var/vmail/sieve/%d/%n.sieve
-       sieve_storage = /var/vmail/sieve/%d/%n/
+       sieve = /var/vmail/sieve/%u.sieve
+       sieve_storage = /var/vmail/sieve/%u/
    }
 }

bundles/dovecot/items.py

@@ -2,8 +2,24 @@ assert node.has_bundle('mailserver')
 
 directories = {
     '/etc/dovecot/ssl': {},
+    '/var/vmail': {
+        'owner': 'vmail',
+        'group': 'vmail',
+    }
 }
 
+# groups['vmail'] = {
+#     'gid': 5000,
+# }
+# 
+# users['vmail'] = {
+#     'uid': 5000,
+#     'home': '/var/vmail',
+#     'needs': [
+#         'group:vmail',
+#     ]
+# }
+
 files = {
     '/etc/dovecot/dovecot.conf': {
         'content_type': 'mako',