From c5fe4cc91fcd5354807fe2e2cf528edf9496198a Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Thu, 5 May 2022 20:19:01 +0200
Subject: surtr: ...

---
 hosts/surtr/email/default.nix | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

(limited to 'hosts/surtr/email')

diff --git a/hosts/surtr/email/default.nix b/hosts/surtr/email/default.nix
index 89dc35f1..e120b337 100644
--- a/hosts/surtr/email/default.nix
+++ b/hosts/surtr/email/default.nix
@@ -137,16 +137,12 @@ in {
         recipient_canonical_classes = ["envelope_recipient" "header_recipient"];
 
         virtual_mailbox_domains = ''pgsql:${pkgs.writeText "virtual_mailbox_domains.cf" ''
-          dbname = emails
-          table = virtual_mailbox_domain
-          select_field = domain
-          where_field = domain
+          hosts = postgresql://localhost/emails
+          query = SELECT domain FROM virtual_mailbox_domain WHERE domain = '%s'
         ''}'';
         virtual_mailbox_maps = ''pgsql:${pkgs.writeText "virtual_mailbox_maps.cf" ''
-          dbname = emails
-          table = virtual_mailbox_mapping
-          select_field = mailbox
-          where_field = lookup
+          hosts = postgresql://localhost/emails
+          query = SELECT mailbox FROM virtual_mailbox_mapping WHERE mailbox = '%s'
         ''}'';
         virtual_transport = "lmtp:unix:/run/postfix/dovecot-lmtp";
       };
-- 
cgit v1.2.3