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

[chef.git] / roles / crm.rb

diff --git a/roles/crm.rb b/roles/crm.rb
index 35776f050c50c9294fe20cdd05c60402472d6a32..5dfa89aaafa2e1d4c6ba49169dcf0b2a2d4964a6 100644 (file)
--- a/roles/crm.rb
+++ b/roles/crm.rb
@@ -1,19 +1,33 @@
 name "crm"
 description "Role applied to CRM server"
 
-
 default_attributes(
+  :accounts => {
+    :users => {
+      :stereo => { :status => :administrator }
+    }
+  },
   :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"]
   }
 )