Merge master into staging-next

2023-12-27 12:00:55 +00:00
parent fe018b8591 9a8519bdc8
commit 04686e4ee3
55 changed files with 749 additions and 331 deletions
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -620,6 +620,7 @@
  ./services/mail/public-inbox.nix
  ./services/mail/roundcube.nix
  ./services/mail/rspamd.nix
+  ./services/mail/rspamd-trainer.nix
  ./services/mail/rss2email.nix
  ./services/mail/schleuder.nix
  ./services/mail/spamassassin.nix