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

[chef.git] / roles / crm.rb

diff --git a/roles/crm.rb b/roles/crm.rb
index ec471523233b96effcf9b3e904b3ff2bd229ce02..5dfa89aaafa2e1d4c6ba49169dcf0b2a2d4964a6 100644 (file)
--- a/roles/crm.rb
+++ b/roles/crm.rb
@@ -2,26 +2,32 @@ name "crm"
 description "Role applied to CRM server"
 
 default_attributes(
 description "Role applied to CRM server"
 
 default_attributes(

+  :accounts => {
+    :users => {
+      :stereo => { :status => :administrator }
+    }
+  },

   :exim => {
   :exim => {

-    :local_domains => ["crm.osmfoundation.org"],
+    :local_domains => ["join.osmfoundation.org"],

     :routes => {
     :routes => {

-      :crm_return => {
-        :comment => "return@crm.osmfoundation.org",
-        :domains => ["crm.osmfoundation.org"],
+      :join_return => {
+        :comment => "return@join.osmfoundation.org",
+        :domains => ["join.osmfoundation.org"],

         :local_parts => ["return"],
         :maildir => "/var/mail/crm-return",
         :user => "www-data",
         :group => "mail"
       },
         :local_parts => ["return"],
         :maildir => "/var/mail/crm-return",
         :user => "www-data",
         :group => "mail"
       },

-      :crm_mail => {
-        :comment => "mail@crm.osmfoundation.org",
-        :domains => ["crm.osmfoundation.org"],
+      :join_mail => {
+        :comment => "mail@join.osmfoundation.org",
+        :domains => ["join.osmfoundation.org"],

         :local_parts => ["mail"],
         :maildir => "/var/mail/crm-mail",
         :user => "www-data",
         :group => "mail"
       }
         :local_parts => ["mail"],
         :maildir => "/var/mail/crm-mail",
         :user => "www-data",
         :group => "mail"
       }

-    }
+    },
+    :trusted_users => ["www-data"]

   }
 )
 
   }
 )