Revert "Remove some redundant settings from chef server configuration"

[chef.git] / roles / crm.rb

diff --git a/roles/crm.rb b/roles/crm.rb
index ec471523233b96effcf9b3e904b3ff2bd229ce02..372c05c57c7eee7e7cfec59af495935afd5bd544 100644 (file)
--- a/roles/crm.rb
+++ b/roles/crm.rb
@@ -2,25 +2,55 @@ name "crm"
 description "Role applied to CRM server"
 
 default_attributes(
+  :accounts => {
+    :users => {
+      :stereo => { :status => :administrator },
+      :jon => { :status => :user }
+    }
+  },
   :exim => {
-    :local_domains => ["crm.osmfoundation.org"],
+    :local_domains => ["join.osmfoundation.org", "supporting.openstreetmap.org"],
     :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"
+      },
+      :join_mail => {
+        :comment => "mail@join.osmfoundation.org",
+        :domains => ["join.osmfoundation.org"],
+        :local_parts => ["mail"],
+        :maildir => "/var/mail/crm-mail",
+        :user => "www-data",
+        :group => "mail"
+      },
+      :supporting_return => {
+        :comment => "return@supporting.openstreetmap.org",
+        :domains => ["supporting.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"],
+      :supporting_mail => {
+        :comment => "mail@supporting.openstreetmap.org",
+        :domains => ["supporting.openstreetmap.org"],
         :local_parts => ["mail"],
         :maildir => "/var/mail/crm-mail",
         :user => "www-data",
         :group => "mail"
       }
+    },
+    :trusted_users => ["www-data"]
+  },
+  :mysql => {
+    :settings => {
+      :mysqld => {
+        :log_bin_trust_function_creators => 1
+      }
     }
   }
 )