From 4a5eb4baea6aa7ed775cf3a842c62b060ab37adb Mon Sep 17 00:00:00 2001
From: Ryan Trinkle <ryan@trinkle.org>
Date: Mon, 8 Apr 2024 13:33:50 +0000
Subject: [PATCH 1/3] Make LMTP memory limit configurable

---
 default.nix             | 8 ++++++++
 mail-server/dovecot.nix | 1 +
 2 files changed, 9 insertions(+)

diff --git a/default.nix b/default.nix
index ac75bce..f8a1305 100644
--- a/default.nix
+++ b/default.nix
@@ -460,6 +460,14 @@ in
       '';
     };
 
+    lmtpMemoryLimit = mkOption {
+      type = types.int;
+      default = 256;
+      description = ''
+        The memory limit for the LMTP service, in megabytes.
+      '';
+    };
+
     extraVirtualAliases = mkOption {
       type = let
         loginAccount = mkOptionType {
diff --git a/mail-server/dovecot.nix b/mail-server/dovecot.nix
index 11f2708..05b5552 100644
--- a/mail-server/dovecot.nix
+++ b/mail-server/dovecot.nix
@@ -291,6 +291,7 @@ in
             mode = 0600
             user = ${postfixCfg.user}
           }
+	  vsz_limit = ${builtins.toString cfg.lmtpMemoryLimit} MB
         }
 
         recipient_delimiter = ${cfg.recipientDelimiter}

From 87ffaad9a3c54560983d133923b2f4f4ebefdca2 Mon Sep 17 00:00:00 2001
From: Ryan Trinkle <ryan@trinkle.org>
Date: Mon, 8 Apr 2024 14:03:19 +0000
Subject: [PATCH 2/3] Add quota-status memory limit

---
 default.nix             | 8 ++++++++
 mail-server/dovecot.nix | 4 ++++
 2 files changed, 12 insertions(+)

diff --git a/default.nix b/default.nix
index f8a1305..dfcb36e 100644
--- a/default.nix
+++ b/default.nix
@@ -468,6 +468,14 @@ in
       '';
     };
 
+    quotaStatusMemoryLimit = mkOption {
+      type = types.int;
+      default = 256;
+      description = ''
+        The memory limit for the quota-status service, in megabytes.
+      '';
+    };
+
     extraVirtualAliases = mkOption {
       type = let
         loginAccount = mkOptionType {
diff --git a/mail-server/dovecot.nix b/mail-server/dovecot.nix
index 05b5552..e4829d1 100644
--- a/mail-server/dovecot.nix
+++ b/mail-server/dovecot.nix
@@ -294,6 +294,10 @@ in
 	  vsz_limit = ${builtins.toString cfg.lmtpMemoryLimit} MB
         }
 
+        service quota-status {
+	  vsz_limit = ${builtins.toString cfg.quotaStatusMemoryLimit} MB
+	}
+
         recipient_delimiter = ${cfg.recipientDelimiter}
         lmtp_save_to_detail_mailbox = ${cfg.lmtpSaveToDetailMailbox}
 

From dc0569066e79ae96184541da6fa28f35a33fbf7b Mon Sep 17 00:00:00 2001
From: Ryan Trinkle <ryan@trinkle.org>
Date: Mon, 8 Apr 2024 14:20:46 +0000
Subject: [PATCH 3/3] Make imap memory limit configurable

---
 default.nix             | 8 ++++++++
 mail-server/dovecot.nix | 4 ++++
 2 files changed, 12 insertions(+)

diff --git a/default.nix b/default.nix
index dfcb36e..8eb9c5b 100644
--- a/default.nix
+++ b/default.nix
@@ -712,6 +712,14 @@ in
       '';
     };
 
+    imapMemoryLimit = mkOption {
+      type = types.int;
+      default = 256;
+      description = ''
+        The memory limit for the imap service, in megabytes.
+      '';
+    };
+
     enableImapSsl = mkOption {
       type = types.bool;
       default = true;
diff --git a/mail-server/dovecot.nix b/mail-server/dovecot.nix
index e4829d1..6e39923 100644
--- a/mail-server/dovecot.nix
+++ b/mail-server/dovecot.nix
@@ -276,6 +276,10 @@ in
           mail_plugins = $mail_plugins imap_sieve
         }
 
+        service imap {
+	  vsz_limit = ${builtins.toString cfg.imapMemoryLimit} MB
+	}
+
         protocol pop3 {
           mail_max_userip_connections = ${toString cfg.maxConnectionsPerUser}
         }