Revert "Don't run cgimap in readonly mode when the database is writable"

[chef.git] / roles / mail.rb

diff --git a/roles/mail.rb b/roles/mail.rb
index d6a72289d245e0de8d9d9bb20905c91eabf5c6e5..483260bb0df9981095e2e5efddb555c6a72c1094 100644 (file)
--- a/roles/mail.rb
+++ b/roles/mail.rb
@@ -16,14 +16,18 @@ 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",
         :domains => ["messages.openstreetmap.org"],
-        :host => ["spike-01.openstreetmap.org", "spike-02.openstreetmap.org", "spike-03.openstreetmap.org"]
+        :host => ["spike-06.openstreetmap.org", "spike-07.openstreetmap.org", "spike-08.openstreetmap.org"]
       },
       :otrs => {
         :comment => "otrs.openstreetmap.org",