Bump kitchen-dokken 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..c1c7d307cea2b959d99f05434efba5984859ba88 100644 (file)
--- a/roles/mail.rb
+++ b/roles/mail.rb
@@ -18,7 +18,13 @@ default_attributes(
     :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"
     ],
     :smarthost_name => "mail.openstreetmap.org",
     :smarthost_via => false,
@@ -40,6 +46,9 @@ default_attributes(
         :host => "ridley.ucl.openstreetmap.org"
       }
     },
+    :dkim_selectors => {
+      "openstreetmap.org" => "20200301"
+    },
     :aliases => {
       "abuse" => "root",
       "postmaster" => "root",
@@ -82,5 +91,6 @@ default_attributes(
 
 run_list(
   "recipe[clamav]",
+  "recipe[exim]",
   "recipe[spamassassin]"
 )