imagery: increase randomise delay on mapserver restart

[chef.git] / roles / crm.rb

diff --git a/roles/crm.rb b/roles/crm.rb
index 7e255307baad6f9018191697b75181d0e9d918f4..372c05c57c7eee7e7cfec59af495935afd5bd544 100644 (file)
--- a/roles/crm.rb
+++ b/roles/crm.rb
@@ -4,11 +4,12 @@ description "Role applied to CRM server"
 default_attributes(
   :accounts => {
     :users => {
-      :stereo => { :status => :administrator }
+      :stereo => { :status => :administrator },
+      :jon => { :status => :user }
     }
   },
   :exim => {
-    :local_domains => ["join.osmfoundation.org"],
+    :local_domains => ["join.osmfoundation.org", "supporting.openstreetmap.org"],
     :routes => {
       :join_return => {
         :comment => "return@join.osmfoundation.org",
@@ -25,6 +26,22 @@ default_attributes(
         :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"
+      },
+      :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"]
@@ -32,9 +49,7 @@ default_attributes(
   :mysql => {
     :settings => {
       :mysqld => {
-        :innodb_strict_mode => true,
-        :innodb_file_per_table => true,
-        :innodb_file_format => "Barracuda"
+        :log_bin_trust_function_creators => 1
       }
     }
   }