Bump test-kitchen from 2.10.0 to 2.11.0

[chef.git] / roles / mail.rb

diff --git a/roles/mail.rb b/roles/mail.rb
index 8df80ee50a0b38b086fd63d206751a6faff812c9..77b3bf3f40a860cc90a8bf932f420aafecc9bb3c 100644 (file)
--- a/roles/mail.rb
+++ b/roles/mail.rb
@@ -18,8 +18,15 @@ default_attributes(
     :daemon_smtp_ports => [25, 26],
     :certificate_names => [
       "mail.openstreetmap.org",
     :daemon_smtp_ports => [25, 26],
     :certificate_names => [
       "mail.openstreetmap.org",

-      "a.mx.openstreetmap.org"
+      "a.mx.openstreetmap.org",
+      "a.mx.osm.org",
+      "a.mx.openstreetmap.com",
+      "a.mx.openstreetmap.io",
+      "a.mx.openstreetmap.pro",
+      "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"],
     :smarthost_name => "mail.openstreetmap.org",
     :smarthost_via => false,
     :dns_blacklists => ["zen.spamhaus.org"],


@@ -40,6 +47,10 @@ default_attributes(
         :host => "ridley.ucl.openstreetmap.org"
       }
     },
         :host => "ridley.ucl.openstreetmap.org"
       }
     },

+    :dkim_selectors => {
+      "openstreetmap.org" => "20200301",
+      "osmfoundation.org" => "20201112"
+    },

     :aliases => {
       "abuse" => "root",
       "postmaster" => "root",
     :aliases => {
       "abuse" => "root",
       "postmaster" => "root",


@@ -48,6 +59,7 @@ default_attributes(
       "rails" => "root",
       "trac" => "root",
       "munin" => "root",
       "rails" => "root",
       "trac" => "root",
       "munin" => "root",

+      "prometheus" => "root",

       "www-data" => "root",
       "osmbackup" => "root",
       "noreply" => "/dev/null",
       "www-data" => "root",
       "osmbackup" => "root",
       "noreply" => "/dev/null",


@@ -82,5 +94,6 @@ default_attributes(
 
 run_list(
   "recipe[clamav]",
 
 run_list(
   "recipe[clamav]",

+  "recipe[exim]",

   "recipe[spamassassin]"
 )
   "recipe[spamassassin]"
 )