X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/4d83b797306b79929737cbd79a59218d4d9c67fe..57997055a817d2104f605a56141ae26515aabbd2:/roles/mail.rb

diff --git a/roles/mail.rb b/roles/mail.rb
index 68b465595..79c65d0d4 100644
--- a/roles/mail.rb
+++ b/roles/mail.rb
@@ -3,7 +3,13 @@ description "Role applied to all mail servers"
 
 default_attributes(
   :exim => {
-    :local_domains => [ "openstreetmap.org", "osm.org", "noreply.openstreetmap.org" ],
+    :local_domains => [
+      "openstreetmap.org",
+      "osm.org",
+      "noreply.openstreetmap.org",
+      "openstreetmap.co.uk",
+      "openstreetmap.org.uk"
+    ],
     :daemon_smtp_ports => [ 25, 26 ],
     :smarthost_name => "mail.openstreetmap.org",
     :smarthost_via => false,
@@ -23,6 +29,11 @@ default_attributes(
         :comment => "tickets.openstreetmap.org",
         :domains => [ "tickets.openstreetmap.org" ],
         :host => "ridley.ucl.openstreetmap.org"
+      },
+      :crm => {
+        :comment => "crm.osmfoundation.org",
+        :domains => [ "crm.osmfoundation.org" ],
+        :host => "ridley.ucl.openstreetmap.org"
       }
     },
     :aliases => {
@@ -56,7 +67,7 @@ default_attributes(
   :munin => {
     :plugins => {
       :exim_mailqueue => {
-        :mails => { 
+        :mails => {
           :warning => 500,
           :critical => 1000
         }