X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/19ca76c7c5e79cbb4e497b937376bffcb42d85fc..f0669c5c4f6b6e0be40d788700ee18fe27643a77:/roles/mail.rb?ds=inline

diff --git a/roles/mail.rb b/roles/mail.rb
index 99fcf1a08..9e3f9bdc9 100644
--- a/roles/mail.rb
+++ b/roles/mail.rb
@@ -26,9 +26,11 @@ default_attributes(
       "a.mx.openstreetmaps.org",
       "a.mx.osm.io"
     ],
+    :queue_run_max => 25,
+    :smtp_accept_max => 200,
     :smarthost_name => "mail.openstreetmap.org",
     :smarthost_via => false,
-    :dns_blacklists => ["zen.spamhaus.org"],
+    :dns_blacklists => ["zen.spamhaus.org!&0.255.255.0"],
     :routes => {
       :messages => {
         :comment => "messages.openstreetmap.org",
@@ -44,10 +46,16 @@ default_attributes(
         :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 => {
-      "openstreetmap.org" => "20200301"
+      "openstreetmap.org" => "20200301",
+      "osmfoundation.org" => "20201112"
     },
     :aliases => {
       "abuse" => "root",
@@ -57,6 +65,7 @@ default_attributes(
       "rails" => "root",
       "trac" => "root",
       "munin" => "root",
+      "prometheus" => "root",
       "www-data" => "root",
       "osmbackup" => "root",
       "noreply" => "/dev/null",
@@ -86,10 +95,16 @@ default_attributes(
         }
       }
     }
+  },
+  :prometheus => {
+    :metrics => {
+      :exim_queue_limit => { :metric => 250 }
+    }
   }
 )
 
 run_list(
   "recipe[clamav]",
+  "recipe[exim]",
   "recipe[spamassassin]"
 )