2 files changed, 7 insertions, 3 deletions

diff --git a/hosts/surtr/email/default.nix b/hosts/surtr/email/default.nix
index fb8573ce..e2f71c21 100644
--- a/hosts/surtr/email/default.nix
+++ b/hosts/surtr/email/default.nix
@@ -287,8 +287,9 @@ in {
         dovecotSqlConf = pkgs.writeText "dovecot-sql.conf" ''
           driver = pgsql
           connect = dbname=email
-          password_query = SELECT user, quota_rule FROM imap_user WHERE user = '%u'
+          password_query = SELECT NULL as password, user as user, quota_rule FROM imap_user WHERE user = '%u'
           user_query = SELECT user, quota_rule FROM imap_user WHERE user = '%u'
+          iterate_query = SELECT user FROM imap_user
         '';
       in ''
         mail_home = /var/lib/mail/%u
@@ -326,6 +327,9 @@ in {
         }
 
         userdb {
+          driver = prefetch
+        }
+        userdb {
           driver = sql
           args = ${dovecotSqlConf}
           default_fields = uid=dovecot2 gid=dovecot2 nopassword
diff --git a/hosts/surtr/postgresql.nix b/hosts/surtr/postgresql.nix
index 71fd6463..c1993431 100644
--- a/hosts/surtr/postgresql.nix
+++ b/hosts/surtr/postgresql.nix
@@ -15,10 +15,10 @@ in {
         CREATE DATABASE "email" WITH TEMPLATE "template0" ENCODING "UTF8" LOCALE "C";
         CREATE USER "postfix";
         GRANT CONNECT ON DATABASE "email" TO "postfix";
-        GRANT SELECT ON ALL TABLES IN SCHEMA public TO "postfix";
+        ALTER DEFAULT PRIVILEGES IN SCHEMA public GRANT SELECT ON TABLES TO "postfix";
         CREATE USER "dovecot2";
         GRANT CONNECT ON DATABASE "email" TO "dovecot2";
-        GRANT SELECT ON ALL TABLES IN SCHEMA public TO "dovecot2";
+        ALTER DEFAULT PRIVILEGES IN SCHEMA public GRANT SELECT ON TABLES TO "dovecot2";
       '';
     };