X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/11618b6cc7af9c1f116f96ec5eeb8973e101f7c4..15c5f64e3607c5d84383af0f8a08137f3fb8a9f6:/roles/mail.rb

diff --git a/roles/mail.rb b/roles/mail.rb
index c2de47e92..347978935 100644
--- a/roles/mail.rb
+++ b/roles/mail.rb
@@ -29,8 +29,8 @@ default_attributes(
     :queue_run_max => 25,
     :smtp_accept_max => 200,
     :smarthost_name => "mail.openstreetmap.org",
-    :smarthost_via => false,
-    :dns_blacklists => ["zen.spamhaus.org"],
+    :smarthost_via => nil,
+    :dns_blacklists => ["zen.spamhaus.org!&0.255.255.0"],
     :routes => {
       :messages => {
         :comment => "messages.openstreetmap.org",
@@ -47,10 +47,15 @@ default_attributes(
         :domains => ["join.osmfoundation.org"],
         :host => "ridley.ucl.openstreetmap.org"
       },
-      :discourse => {
-        :comment => "community.osmfoundation.org",
-        :domains => ["community.osmfoundation.org"],
-        :host => "lockheed.ams.openstreetmap.org::2500"
+      :supporting => {
+        :comment => "supporting.openstreetmap.org",
+        :domains => ["supporting.openstreetmap.org"],
+        :host => "ridley.ucl.openstreetmap.org"
+      },
+      :community => {
+        :comment => "community.openstreetmap.org",
+        :domains => ["community.openstreetmap.org"],
+        :host => "jakelong.dub.openstreetmap.org::2500"
       }
     },
     :dkim_selectors => {
@@ -98,7 +103,7 @@ default_attributes(
   },
   :prometheus => {
     :metrics => {
-      :exim_queue_limit => { :metric => 250 }
+      :exim_queue_limit => { :metric => 2500 }
     }
   }
 )