Revert "Reduce squid memory limit on toothless"

[chef.git] / roles / mail.rb

diff --git a/roles/mail.rb b/roles/mail.rb
index 6556b08ca30aea2606bcd0581c550d1de5fe103a..483260bb0df9981095e2e5efddb555c6a72c1094 100644 (file)
--- a/roles/mail.rb
+++ b/roles/mail.rb
@@ -16,6 +16,10 @@ 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 => ["zen.spamhaus.org"],
@@ -23,7 +27,7 @@ default_attributes(
       :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",