X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/4c35cca55478f6c0f76b2620a8beb22e18fb2278..aec1cf26497af11e487a6a62ac924f514bc4ecf3:/roles/crm.rb

diff --git a/roles/crm.rb b/roles/crm.rb
index 35776f050..44b521cba 100644
--- a/roles/crm.rb
+++ b/roles/crm.rb
@@ -1,19 +1,28 @@
 name "crm"
 description "Role applied to CRM server"
 
-
 default_attributes(
   :exim => {
-    :local_domains => [ "crm.osmfoundation.org" ],
+    :local_domains => ["join.osmfoundation.org"],
     :routes => {
-      :crm => {
-        :comment => "crm.osmfoundation.org",
-        :domains => [ "crm.osmfoundation.org" ],
-        :maildir => "/var/mail/crm",
-        :user => "wordpress",
+      :join_return => {
+        :comment => "return@join.osmfoundation.org",
+        :domains => ["join.osmfoundation.org"],
+        :local_parts => ["return"],
+        :maildir => "/var/mail/crm-return",
+        :user => "www-data",
+        :group => "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"]
   }
 )