Update carto stylesheet to v2.36.0

[chef.git] / roles / mail.rb

diff --git a/roles/mail.rb b/roles/mail.rb
index 5cdb8372fedeb86fcf75393c9558c282987cc46b..cb81cb3602910015d06df2e069b3ed199c2b9636 100644 (file)
--- a/roles/mail.rb
+++ b/roles/mail.rb
@@ -3,30 +3,41 @@ description "Role applied to all mail servers"
 
 default_attributes(
   :exim => {
-    :local_domains => [ "openstreetmap.org", "osm.org", "noreply.openstreetmap.org" ],
-    :daemon_smtp_ports => [ 25, 26 ],
+    :local_domains => [
+      "openstreetmap.org",
+      "osm.org",
+      "noreply.openstreetmap.org",
+      "openstreetmap.co.uk",
+      "openstreetmap.org.uk",
+      "openstreetmap.com",
+      "openstreetmap.io",
+      "openstreetmap.pro",
+      "openstreetmaps.org",
+      "osm.io"
+    ],
+    :daemon_smtp_ports => [25, 26],
     :smarthost_name => "mail.openstreetmap.org",
     :smarthost_via => false,
-    :dns_blacklists => [ "sbl-xbl.spamhaus.org" ],
+    :dns_blacklists => ["sbl-xbl.spamhaus.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-01.openstreetmap.org", "spike-02.openstreetmap.org", "spike-03.openstreetmap.org"]
       },
       :otrs => {
         :comment => "otrs.openstreetmap.org",
-        :domains => [ "otrs.openstreetmap.org" ],
+        :domains => ["otrs.openstreetmap.org"],
         :host => "ridley.ucl.openstreetmap.org"
       },
       :tickets => {
         :comment => "tickets.openstreetmap.org",
-        :domains => [ "tickets.openstreetmap.org" ],
+        :domains => ["tickets.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"
       }
     },
@@ -61,7 +72,7 @@ default_attributes(
   :munin => {
     :plugins => {
       :exim_mailqueue => {
-        :mails => { 
+        :mails => {
           :warning => 500,
           :critical => 1000
         }