Update carto stylesheet to v2.44.1

[chef.git] / roles / mail.rb

diff --git a/roles/mail.rb b/roles/mail.rb
index 73fe22e4a7a3f47fa9052ceef0deeaf10028bc34..d6a72289d245e0de8d9d9bb20905c91eabf5c6e5 100644 (file)
--- a/roles/mail.rb
+++ b/roles/mail.rb
@@ -8,31 +8,36 @@ 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],

     :smarthost_name => "mail.openstreetmap.org",
     :smarthost_via => false,
     :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",
     :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",
       },
       :otrs => {
         :comment => "otrs.openstreetmap.org",

-        :domains => [ "otrs.openstreetmap.org" ],
+        :domains => ["otrs.openstreetmap.org"],

         :host => "ridley.ucl.openstreetmap.org"
       },
       :tickets => {
         :comment => "tickets.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"
       },
         :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"
       }
     },


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

-      "thinkup" => "root",

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


@@ -67,7 +71,7 @@ default_attributes(
   :munin => {
     :plugins => {
       :exim_mailqueue => {
   :munin => {
     :plugins => {
       :exim_mailqueue => {

-        :mails => { 
+        :mails => {

           :warning => 500,
           :critical => 1000
         }
           :warning => 500,
           :critical => 1000
         }