Make exim trust the rails users on all web machines

diff --git a/roles/web-frontend.rb b/roles/web-frontend.rb
index 5f23e0618361d3e7ee76c300cc3821b42b808eb3..5010e555dfaca959e8f53074231ada3efc929659 100644 (file)
--- 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 a3bcbc9b36d3fe388d532ad6a5dc43b763866b33..3276e43e4dc8bd7fdfbec542a1057c0dc61eadd3 100644 (file)
--- a/roles/web.rb
+++ b/roles/web.rb
@@ -10,6 +10,9 @@ default_attributes(
       }
     }
   },
+  :exim => {
+    :trusted_users => ["rails"]
+  },
   :passenger => {
     :pool_idle_time => 3600
   },