Use new style extension initialisation for osmtaginfo

[chef.git] / roles / mail.rb

diff --git a/roles/mail.rb b/roles/mail.rb
index 99fcf1a08fbc90d224f125c05a5e531eee90c529..f434cd0e86df3883cd83d8d253df5c3e10434321 100644 (file)
--- a/roles/mail.rb
+++ b/roles/mail.rb
@@ -26,6 +26,8 @@ default_attributes(
       "a.mx.openstreetmaps.org",
       "a.mx.osm.io"
     ],
       "a.mx.openstreetmaps.org",
       "a.mx.osm.io"
     ],

+    :queue_run_max => 25,
+    :smtp_accept_max => 200,

     :smarthost_name => "mail.openstreetmap.org",
     :smarthost_via => false,
     :dns_blacklists => ["zen.spamhaus.org"],
     :smarthost_name => "mail.openstreetmap.org",
     :smarthost_via => false,
     :dns_blacklists => ["zen.spamhaus.org"],


@@ -47,7 +49,8 @@ default_attributes(
       }
     },
     :dkim_selectors => {
       }
     },
     :dkim_selectors => {

-      "openstreetmap.org" => "20200301"
+      "openstreetmap.org" => "20200301",
+      "osmfoundation.org" => "20201112"

     },
     :aliases => {
       "abuse" => "root",
     },
     :aliases => {
       "abuse" => "root",


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

+      "prometheus" => "root",

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


@@ -86,10 +90,16 @@ default_attributes(
         }
       }
     }
         }
       }
     }

+  },
+  :prometheus => {
+    :metrics => {
+      :exim_queue_limit => { :metric => 500 }
+    }

   }
 )
 
 run_list(
   "recipe[clamav]",
   }
 )
 
 run_list(
   "recipe[clamav]",

+  "recipe[exim]",

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