Merge remote-tracking branch 'github/pull/464'

[chef.git] / roles / mail.rb

diff --git a/roles/mail.rb b/roles/mail.rb
index 79c65d0d460ebe355c8aec4e8465506b42e8c2c9..50382b03bef7562cfd9b57841612aa175a2f7491 100644 (file)
--- a/roles/mail.rb
+++ b/roles/mail.rb
@@ -8,34 +8,50 @@ default_attributes(
       "osm.org",
       "noreply.openstreetmap.org",
       "openstreetmap.co.uk",
       "osm.org",
       "noreply.openstreetmap.org",
       "openstreetmap.co.uk",

-      "openstreetmap.org.uk"
+      "openstreetmap.org.uk",
+      "openstreetmap.com",
+      "openstreetmap.io",
+      "openstreetmap.pro",
+      "openstreetmaps.org",
+      "osm.io"

     ],
     ],

-    :daemon_smtp_ports => [ 25, 26 ],
+    :daemon_smtp_ports => [25, 26],
+    :certificate_names => [
+      "mail.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,
+    :smtp_accept_max => 200,

     :smarthost_name => "mail.openstreetmap.org",
     :smarthost_via => false,
     :smarthost_name => "mail.openstreetmap.org",
     :smarthost_via => false,

-    :dns_blacklists => [ "sbl-xbl.spamhaus.org" ],
+    :dns_blacklists => ["zen.spamhaus.org"],

     :routes => {
       :messages => {
         :comment => "messages.openstreetmap.org",
     :routes => {
       :messages => {
         :comment => "messages.openstreetmap.org",

-        :domains => [ "messages.openstreetmap.org" ],
-        :host => [ "spike-01.openstreetmap.org", "spike-02.openstreetmap.org", "spike-03.openstreetmap.org" ]
+        :domains => ["messages.openstreetmap.org"],
+        :host => ["spike-06.openstreetmap.org", "spike-07.openstreetmap.org", "spike-08.openstreetmap.org"]

       },
       :otrs => {
         :comment => "otrs.openstreetmap.org",
       },
       :otrs => {
         :comment => "otrs.openstreetmap.org",

-        :domains => [ "otrs.openstreetmap.org" ],
-        :host => "ridley.ucl.openstreetmap.org"
-      },
-      :tickets => {
-        :comment => "tickets.openstreetmap.org",
-        :domains => [ "tickets.openstreetmap.org" ],
+        :domains => ["otrs.openstreetmap.org"],

         :host => "ridley.ucl.openstreetmap.org"
       },
         :host => "ridley.ucl.openstreetmap.org"
       },

-      :crm => {
-        :comment => "crm.osmfoundation.org",
-        :domains => [ "crm.osmfoundation.org" ],
+      :join => {
+        :comment => "join.osmfoundation.org",
+        :domains => ["join.osmfoundation.org"],

         :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",


@@ -44,7 +60,7 @@ default_attributes(
       "rails" => "root",
       "trac" => "root",
       "munin" => "root",
       "rails" => "root",
       "trac" => "root",
       "munin" => "root",

-      "thinkup" => "root",
+      "prometheus" => "root",

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


@@ -60,7 +76,8 @@ default_attributes(
       "support" => "support@otrs.openstreetmap.org",
       "memorial" => "communication@osmfoundation.org",
       "legal" => "legal@osmfoundation.org",
       "support" => "support@otrs.openstreetmap.org",
       "memorial" => "communication@osmfoundation.org",
       "legal" => "legal@osmfoundation.org",

-      "dmca" => "dmca@osmfoundation.org"
+      "dmca" => "dmca@osmfoundation.org",
+      "program-sotm" => "sotm-program@otrs.openstreetmap.org"

     },
     :private_aliases => "mail"
   },
     },
     :private_aliases => "mail"
   },


@@ -78,5 +95,6 @@ default_attributes(
 
 run_list(
   "recipe[clamav]",
 
 run_list(
   "recipe[clamav]",

+  "recipe[exim]",

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