From 555d1b1267a21a809f69093fe4e730c7090bd4ce Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Mon, 1 Apr 2019 12:35:28 +0100
Subject: [PATCH] Make exim trust the rails users on all web machines

---
 roles/web-frontend.rb | 1 -
 roles/web.rb          | 3 +++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/roles/web-frontend.rb b/roles/web-frontend.rb
index 5f23e0618..5010e555d 100644
--- a/roles/web-frontend.rb
+++ b/roles/web-frontend.rb
@@ -26,7 +26,6 @@ default_attributes(
   },
   :exim => {
     :local_domains => ["messages.openstreetmap.org"],
-    :trusted_users => ["rails"],
     :routes => {
       :messages => {
         :comment => "messages.openstreetmap.org",
diff --git a/roles/web.rb b/roles/web.rb
index a3bcbc9b3..3276e43e4 100644
--- a/roles/web.rb
+++ b/roles/web.rb
@@ -10,6 +10,9 @@ default_attributes(
       }
     }
   },
+  :exim => {
+    :trusted_users => ["rails"]
+  },
   :passenger => {
     :pool_idle_time => 3600
   },
-- 
2.43.2