X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/289ca54bf66cf7b20cc6751c21856ebe971da125..8515692fead30696a1466f419a01eea95d481cc5:/roles/mail.rb

diff --git a/roles/mail.rb b/roles/mail.rb
index 6556b08ca..288eb22d3 100644
--- a/roles/mail.rb
+++ b/roles/mail.rb
@@ -16,6 +16,10 @@ default_attributes(
       "osm.io"
     ],
     :daemon_smtp_ports => [25, 26],
+    :certificate_names => [
+      "mail.openstreetmap.org",
+      "a.mx.openstreetmap.org"
+    ],
     :smarthost_name => "mail.openstreetmap.org",
     :smarthost_via => false,
     :dns_blacklists => ["zen.spamhaus.org"],
@@ -23,7 +27,7 @@ default_attributes(
       :messages => {
         :comment => "messages.openstreetmap.org",
         :domains => ["messages.openstreetmap.org"],
-        :host => ["spike-01.openstreetmap.org", "spike-02.openstreetmap.org", "spike-03.openstreetmap.org"]
+        :host => ["spike-06.openstreetmap.org", "spike-07.openstreetmap.org", "spike-08.openstreetmap.org"]
       },
       :otrs => {
         :comment => "otrs.openstreetmap.org",
@@ -64,7 +68,8 @@ default_attributes(
       "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"
   },