1 files changed, 6 insertions, 1 deletions

diff --git a/hosts/surtr/email/default.nix b/hosts/surtr/email/default.nix
index f73b4be0..8889991c 100644
--- a/hosts/surtr/email/default.nix
+++ b/hosts/surtr/email/default.nix
@@ -139,11 +139,16 @@ in {
         virtual_mailbox_domains = ''pgsql:${pkgs.writeText "virtual_mailbox_domains.cf" ''
           hosts = postgresql:///email
           dbname = email
-          query = SELECT domain FROM virtual_mailbox_domain WHERE domain = '%s'
+          query = SELECT 1 FROM virtual_mailbox_domain WHERE domain = '%s'
         ''}'';
         virtual_mailbox_maps = ''pgsql:${pkgs.writeText "virtual_mailbox_maps.cf" ''
           hosts = postgresql:///email
           dbname = email
+          query = SELECT 1 FROM virtual_mailbox_mapping WHERE lookup = '%s'
+        ''}'';
+        lmtp_generic_maps = ''pgsql:${pkgs.writeText "virtual_mailbox_maps.cf" ''
+          hosts = postgresql:///email
+          dbname = email
           query = SELECT mailbox FROM virtual_mailbox_mapping WHERE lookup = '%s'
         ''}'';
         virtual_transport = "lmtp:unix:/run/postfix/dovecot-lmtp";