Remove me as explicit root alias on ridley

[chef.git] / roles / crm.rb

diff --git a/roles/crm.rb b/roles/crm.rb
index ee6a58fff1abaad197cf043cef96e28b01f5ae18..44b521cbacc2296c9780eeec7bb1c52345ec7732 100644 (file)
--- a/roles/crm.rb
+++ b/roles/crm.rb
@@ -3,25 +3,26 @@ description "Role applied to CRM server"
 
 default_attributes(
   :exim => {
-    :local_domains => [ "crm.osmfoundation.org" ],
+    :local_domains => ["join.osmfoundation.org"],
     :routes => {
-      :crm_return => {
-        :comment => "return@crm.osmfoundation.org",
-        :domains => [ "crm.osmfoundation.org" ],
-        :local_parts => [ "return" ],
+      :join_return => {
+        :comment => "return@join.osmfoundation.org",
+        :domains => ["join.osmfoundation.org"],
+        :local_parts => ["return"],
         :maildir => "/var/mail/crm-return",
         :user => "www-data",
         :group => "mail"
       },
-      :crm_mail => {
-        :comment => "mail@crm.osmfoundation.org",
-        :domains => [ "crm.osmfoundation.org" ],
-        :local_parts => [ "mail" ],
+      :join_mail => {
+        :comment => "mail@join.osmfoundation.org",
+        :domains => ["join.osmfoundation.org"],
+        :local_parts => ["mail"],
         :maildir => "/var/mail/crm-mail",
         :user => "www-data",
         :group => "mail"
       }
-    }
+    },
+    :trusted_users => ["www-data"]
   }
 )