...

2 files changed, 7 insertions, 4 deletions

diff --git a/hosts/surtr/dns/zones/email.bouncy.soa b/hosts/surtr/dns/zones/email.bouncy.soa
index abf8ef07..3f038b92 100644
--- a/hosts/surtr/dns/zones/email.bouncy.soa
+++ b/hosts/surtr/dns/zones/email.bouncy.soa
@@ -1,7 +1,7 @@
 $ORIGIN bouncy.email.
 $TTL 3600
 @ IN SOA ns.yggdrasil.li. root.yggdrasil.li. (
-  2022071002 ; serial
+  2022100600 ; serial
   10800      ; refresh
   3600       ; retry
   604800     ; expire
@@ -69,7 +69,7 @@ spm			IN	MX	0 mailin.bouncy.email.
 spm                     IN      TXT     "v=spf1 redirect=bouncy.email"
 _acme-challenge.spm     IN      NS      ns.yggdrasil.li.
 
-_mta-sts                IN      TXT     "v=STSv1; id=2022071002"
+_mta-sts                IN      TXT     "v=STSv1; id=2022100600"
 _smtp._tls              IN      TXT     "v=TLSRPTv1; rua=mailto:postmaster@bouncy.email"
 mta-sts                 IN      A       202.61.241.61
 mta-sts                 IN      AAAA    2a03:4000:52:ada::
diff --git a/hosts/surtr/email/default.nix b/hosts/surtr/email/default.nix
index 2fe5b7f0..42b50c88 100644
--- a/hosts/surtr/email/default.nix
+++ b/hosts/surtr/email/default.nix
@@ -412,6 +412,8 @@ in {
       in ''
         mail_home = /var/lib/mail/%u
 
+        mail_plugins = $mail_plugins quota
+
         first_valid_uid = ${toString config.users.users.dovecot2.uid}
         last_valid_uid = ${toString config.users.users.dovecot2.uid}
         first_valid_gid = ${toString config.users.groups.dovecot2.gid}
@@ -473,9 +475,10 @@ in {
             result_failure = return-fail
             result_internalfail = return-fail
           }
+
+          mail_plugins = $mail_plugins sieve
         }
 
-        mail_plugins = $mail_plugins quota
         mailbox_list_index = yes
         postmaster_address = postmaster@yggdrasil.li
         recipient_delimiter =
@@ -732,7 +735,7 @@ in {
               cp ${pkgs.writeText "mta-sts.txt" ''
                 version: STSv1
                 mode: enforce
-                max_age: 604800
+                max_age: 2419200
                 mx: mailin.bouncy.email
               ''} $out/.well-known/mta-sts.txt
             '';