Fix noreply body lookup

[chef.git] / roles / mail.rb

diff --git a/roles/mail.rb b/roles/mail.rb
index 660bb9f2f195e7466cf75293a12325cdfff8eb45..b807c9c74de83964459f09b760c83e313324f0f7 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"],


@@ -44,6 +46,11 @@ default_attributes(
         :comment => "join.osmfoundation.org",
         :domains => ["join.osmfoundation.org"],
         :host => "ridley.ucl.openstreetmap.org"
         :comment => "join.osmfoundation.org",
         :domains => ["join.osmfoundation.org"],
         :host => "ridley.ucl.openstreetmap.org"

+      },
+      :community => {
+        :comment => "community.openstreetmap.org",
+        :domains => ["community.openstreetmap.org"],
+        :host => "lockheed.ams.openstreetmap.org::2500"

       }
     },
     :dkim_selectors => {
       }
     },
     :dkim_selectors => {


@@ -58,6 +65,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",


@@ -87,6 +95,11 @@ default_attributes(
         }
       }
     }
         }
       }
     }

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

   }
 )
 
   }
 )