Add ae60 to uplink interfaces in Dublin

[chef.git] / roles / mail.rb

diff --git a/roles/mail.rb b/roles/mail.rb
index 5783e1bda2f5ae2c1e793b94e9d4d823f317b58f..a96a200a86e3a8f8e2400ce05a50b17e1a997f07 100644 (file)
--- a/roles/mail.rb
+++ b/roles/mail.rb
@@ -26,9 +26,11 @@ default_attributes(
       "a.mx.openstreetmaps.org",
       "a.mx.osm.io"
     ],
       "a.mx.openstreetmaps.org",
       "a.mx.osm.io"
     ],

+    :queue_run_max => 25,
+    :smtp_accept_max => 200,

     :smarthost_name => "mail.openstreetmap.org",
     :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",
     :routes => {
       :messages => {
         :comment => "messages.openstreetmap.org",


@@ -44,6 +46,11 @@ default_attributes(
         :comment => "join.osmfoundation.org",
         :domains => ["join.osmfoundation.org"],
         :host => "ridley.ucl.openstreetmap.org"
         :comment => "join.osmfoundation.org",
         :domains => ["join.osmfoundation.org"],
         :host => "ridley.ucl.openstreetmap.org"

+      },
+      :community => {
+        :comment => "community.openstreetmap.org",
+        :domains => ["community.openstreetmap.org"],
+        :host => "jakelong.dub.openstreetmap.org::2500"

       }
     },
     :dkim_selectors => {
       }
     },
     :dkim_selectors => {


@@ -88,6 +95,11 @@ default_attributes(
         }
       }
     }
         }
       }
     }

+  },
+  :prometheus => {
+    :metrics => {
+      :exim_queue_limit => { :metric => 250 }
+    }

   }
 )
 
   }
 )