Block direct image downloads for private wikis

[chef.git] / roles / mail.rb

diff --git a/roles/mail.rb b/roles/mail.rb
index 68b465595744418c41fefe3df30678316e32a397..73fe22e4a7a3f47fa9052ceef0deeaf10028bc34 100644 (file)
--- 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 => {