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

diff --git a/roles/crm.rb b/roles/crm.rb
index 35776f050..b5675b0de 100644
--- a/roles/crm.rb
+++ b/roles/crm.rb
@@ -1,16 +1,24 @@
 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"
       }
     }