Use all frontends for processing rails message mail

[chef.git] / roles / mail.rb

diff --git a/roles/mail.rb b/roles/mail.rb
index 9e3f9bdc907e190344817a8e9e47537c76d78de7..6cf89549391c925261d98b8f8cc7d91a499ab48d 100644 (file)
--- a/roles/mail.rb
+++ b/roles/mail.rb
@@ -29,13 +29,20 @@ default_attributes(
     :queue_run_max => 25,
     :smtp_accept_max => 200,
     :smarthost_name => "mail.openstreetmap.org",
-    :smarthost_via => false,
+    :smarthost_via => nil,
     :dns_blacklists => ["zen.spamhaus.org!&0.255.255.0"],
     :routes => {
       :messages => {
         :comment => "messages.openstreetmap.org",
         :domains => ["messages.openstreetmap.org"],
-        :host => ["spike-06.openstreetmap.org", "spike-07.openstreetmap.org", "spike-08.openstreetmap.org"]
+        :host => [
+          "spike-01.openstreetmap.org",
+          "spike-02.openstreetmap.org",
+          "spike-03.openstreetmap.org",
+          "spike-06.openstreetmap.org",
+          "spike-07.openstreetmap.org",
+          "spike-08.openstreetmap.org"
+        ]
       },
       :otrs => {
         :comment => "otrs.openstreetmap.org",
@@ -47,6 +54,11 @@ default_attributes(
         :domains => ["join.osmfoundation.org"],
         :host => "ridley.ucl.openstreetmap.org"
       },
+      :supporting => {
+        :comment => "supporting.openstreetmap.org",
+        :domains => ["supporting.openstreetmap.org"],
+        :host => "ridley.ucl.openstreetmap.org"
+      },
       :community => {
         :comment => "community.openstreetmap.org",
         :domains => ["community.openstreetmap.org"],
@@ -98,7 +110,7 @@ default_attributes(
   },
   :prometheus => {
     :metrics => {
-      :exim_queue_limit => { :metric => 250 }
+      :exim_queue_limit => { :metric => 2500 }
     }
   }
 )