Bump cookstyle from 7.14.2 to 7.15.0

[chef.git] / roles / mail.rb

diff --git a/roles/mail.rb b/roles/mail.rb
index 516c2b89e5184bc1e3acb712edeba73ea050b138..77b3bf3f40a860cc90a8bf932f420aafecc9bb3c 100644 (file)
--- a/roles/mail.rb
+++ b/roles/mail.rb
@@ -26,6 +26,7 @@ default_attributes(
       "a.mx.openstreetmaps.org",
       "a.mx.osm.io"
     ],
+    :queue_run_max => 5,
     :smarthost_name => "mail.openstreetmap.org",
     :smarthost_via => false,
     :dns_blacklists => ["zen.spamhaus.org"],
@@ -46,6 +47,10 @@ default_attributes(
         :host => "ridley.ucl.openstreetmap.org"
       }
     },
+    :dkim_selectors => {
+      "openstreetmap.org" => "20200301",
+      "osmfoundation.org" => "20201112"
+    },
     :aliases => {
       "abuse" => "root",
       "postmaster" => "root",
@@ -54,6 +59,7 @@ default_attributes(
       "rails" => "root",
       "trac" => "root",
       "munin" => "root",
+      "prometheus" => "root",
       "www-data" => "root",
       "osmbackup" => "root",
       "noreply" => "/dev/null",
@@ -88,5 +94,6 @@ default_attributes(
 
 run_list(
   "recipe[clamav]",
+  "recipe[exim]",
   "recipe[spamassassin]"
 )