X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/e8be2915501c7061362d00e05befdd91d6e39fe8..b0e42ea229284e21d5d05b2e87153c733efb81d1:/roles/mail.rb

diff --git a/roles/mail.rb b/roles/mail.rb
index d4cb37518..6556b08ca 100644
--- a/roles/mail.rb
+++ b/roles/mail.rb
@@ -18,7 +18,7 @@ default_attributes(
     :daemon_smtp_ports => [25, 26],
     :smarthost_name => "mail.openstreetmap.org",
     :smarthost_via => false,
-    :dns_blacklists => ["sbl-xbl.spamhaus.org"],
+    :dns_blacklists => ["zen.spamhaus.org"],
     :routes => {
       :messages => {
         :comment => "messages.openstreetmap.org",
@@ -35,9 +35,9 @@ default_attributes(
         :domains => ["tickets.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"
       }
     },
@@ -49,7 +49,6 @@ default_attributes(
       "rails" => "root",
       "trac" => "root",
       "munin" => "root",
-      "thinkup" => "root",
       "www-data" => "root",
       "osmbackup" => "root",
       "noreply" => "/dev/null",