2 files changed, 9 insertions, 1 deletions

diff --git a/hosts/surtr/email/default.nix b/hosts/surtr/email/default.nix
index b3306ece..9abb9a7e 100644
--- a/hosts/surtr/email/default.nix
+++ b/hosts/surtr/email/default.nix
@@ -319,7 +319,6 @@ in {
         auth_ssl_username_from_cert = yes
         ssl_cert_username_field = commonName
         auth_mechanisms = external
-        auth_username_format = %n
 
         auth_verbose = yes
         verbose_ssl = yes
diff --git a/hosts/surtr/postgresql.nix b/hosts/surtr/postgresql.nix
index bbe8d01b..28ccd8c4 100644
--- a/hosts/surtr/postgresql.nix
+++ b/hosts/surtr/postgresql.nix
@@ -56,6 +56,15 @@ in {
 
           CREATE VIEW lmtp_mapping ("user", quota_rule, local, domain) AS SELECT mailbox.mailbox AS "user", (CASE WHEN quota_bytes IS NULL THEN '*:ignore' ELSE '*:bytes=' || quota_bytes END) AS quota_rule, local, domain FROM mailbox INNER JOIN mailbox_mapping ON mailbox.id = mailbox_mapping.mailbox;
           COMMIT;
+
+          BEGIN;
+          SELECT _v.register_patch('002-citext', ARRAY['000-base'], null);
+
+          CREATE EXTENSION citext;
+          ALTER TABLE mailbox ALTER mailbox TYPE citext;
+          ALTER TABLE mailbox_mapping ALTER local TYPE citext;
+          ALTER TABLE mailbox_mapping ALTER domain TYPE citext;
+          COMMIT;
         ''}
       '';
     };