Update IP addresses for pyrene

[chef.git] / roles / mail.rb

diff --git a/roles/mail.rb b/roles/mail.rb
index cb81cb3602910015d06df2e069b3ed199c2b9636..e2ec91dedbb8f1f7c74ca27bea77753c65b3518a 100644 (file)
--- a/roles/mail.rb
+++ b/roles/mail.rb
@@ -16,9 +16,13 @@ default_attributes(
       "osm.io"
     ],
     :daemon_smtp_ports => [25, 26],
+    :certificate_names => [
+      "mail.openstreetmap.org",
+      "a.mx.openstreetmap.org"
+    ],
     :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",
@@ -49,7 +53,6 @@ default_attributes(
       "rails" => "root",
       "trac" => "root",
       "munin" => "root",
-      "thinkup" => "root",
       "www-data" => "root",
       "osmbackup" => "root",
       "noreply" => "/dev/null",