Format, add user account request form

[chef.git] / roles / mail.rb

diff --git a/roles/mail.rb b/roles/mail.rb
index f434cd0e86df3883cd83d8d253df5c3e10434321..9e3f9bdc907e190344817a8e9e47537c76d78de7 100644 (file)
--- a/roles/mail.rb
+++ b/roles/mail.rb
@@ -30,7 +30,7 @@ default_attributes(
     :smtp_accept_max => 200,
     :smarthost_name => "mail.openstreetmap.org",
     :smarthost_via => false,
     :smtp_accept_max => 200,
     :smarthost_name => "mail.openstreetmap.org",
     :smarthost_via => false,

-    :dns_blacklists => ["zen.spamhaus.org"],
+    :dns_blacklists => ["zen.spamhaus.org!&0.255.255.0"],

     :routes => {
       :messages => {
         :comment => "messages.openstreetmap.org",
     :routes => {
       :messages => {
         :comment => "messages.openstreetmap.org",


@@ -46,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 => "jakelong.dub.openstreetmap.org::2500"

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


@@ -93,7 +98,7 @@ default_attributes(
   },
   :prometheus => {
     :metrics => {
   },
   :prometheus => {
     :metrics => {

-      :exim_queue_limit => { :metric => 500 }
+      :exim_queue_limit => { :metric => 250 }

     }
   }
 )
     }
   }
 )