Merge remote-tracking branch 'github/pull/79'

[chef.git] / roles / mail.rb

diff --git a/roles/mail.rb b/roles/mail.rb
index d4cb3751847ba0c02ca61dc4b724660a8715a823..cb81cb3602910015d06df2e069b3ed199c2b9636 100644 (file)
--- a/roles/mail.rb
+++ b/roles/mail.rb
@@ -35,9 +35,9 @@ default_attributes(
         :domains => ["tickets.openstreetmap.org"],
         :host => "ridley.ucl.openstreetmap.org"
       },
-      :crm => {
-        :comment => "crm.osmfoundation.org",
-        :domains => ["crm.osmfoundation.org"],
+      :join => {
+        :comment => "join.osmfoundation.org",
+        :domains => ["join.osmfoundation.org"],
         :host => "ridley.ucl.openstreetmap.org"
       }
     },