From f86c4e2d9c0d075b1ec280736f4abe557e7f71d8 Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Tue, 8 Sep 2026 12:22:51 +0100
Subject: [PATCH] Filter out some senders from OTRS

---
 cookbooks/exim/templates/default/exim4.conf.erb | 3 +++
 roles/mail.rb                                   | 1 +
 2 files changed, 4 insertions(+)

diff --git a/cookbooks/exim/templates/default/exim4.conf.erb b/cookbooks/exim/templates/default/exim4.conf.erb
index 3e6b899ac..c5ee72135 100644
--- a/cookbooks/exim/templates/default/exim4.conf.erb
+++ b/cookbooks/exim/templates/default/exim4.conf.erb
@@ -668,6 +668,9 @@ noreply:
   local_part_suffix = +*
   local_part_suffix_optional
 <% end -%>
+<% if details[:senders] -%>
+  senders = <%= details[:senders].join(":") %>
+<% end -%>
 <% if details[:condition] -%>
   condition = <%= details[:condition] %>
 <% end -%>
diff --git a/roles/mail.rb b/roles/mail.rb
index c9cf8ec1d..1779f59b5 100644
--- a/roles/mail.rb
+++ b/roles/mail.rb
@@ -47,6 +47,7 @@ default_attributes(
       :otrs => {
         :comment => "otrs.openstreetmap.org",
         :domains => ["otrs.openstreetmap.org"],
+        :senders => ["!postmaster@*", "!noreply@*", "!no-reply@*", "!mailer-daemon@*"],
         :condition => "${if or {{def:h_auto-submitted:}{def:h_x-autorespond:}} {no}{yes}}",
         :host => "naga.dub.openstreetmap.org"
       },
-- 
2.47.3