Add he.net addresses to remaining Amsterdam machines

[chef.git] / roles / mail.rb

diff --git a/roles/mail.rb b/roles/mail.rb
index bb64e08145cdc862adc85083c87392134171b459..a96a200a86e3a8f8e2400ce05a50b17e1a997f07 100644 (file)
--- a/roles/mail.rb
+++ b/roles/mail.rb
@@ -29,8 +29,8 @@ default_attributes(
     :queue_run_max => 25,
     :smtp_accept_max => 200,
     :smarthost_name => "mail.openstreetmap.org",
     :queue_run_max => 25,
     :smtp_accept_max => 200,
     :smarthost_name => "mail.openstreetmap.org",

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

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


@@ -47,10 +47,10 @@ default_attributes(
         :domains => ["join.osmfoundation.org"],
         :host => "ridley.ucl.openstreetmap.org"
       },
         :domains => ["join.osmfoundation.org"],
         :host => "ridley.ucl.openstreetmap.org"
       },

-      :discourse => {
-        :comment => "community.osmfoundation.org",
-        :domains => ["community.osmfoundation.org"],
-        :host => "lockheed.ams.openstreetmap.org"
+      :community => {
+        :comment => "community.openstreetmap.org",
+        :domains => ["community.openstreetmap.org"],
+        :host => "jakelong.dub.openstreetmap.org::2500"

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