Switch to custom PAM file for FTP

[chef.git] / roles / crm.rb

diff --git a/roles/crm.rb b/roles/crm.rb
index 032bc40a3765c9d8697ec6553b20885826b5d468..28f20e14a3106d283bd24b471f35e45a4ae20b5e 100644 (file)
--- a/roles/crm.rb
+++ b/roles/crm.rb
@@ -1,27 +1,36 @@
 name "crm"
 description "Role applied to CRM server"
 
 name "crm"
 description "Role applied to CRM server"
 

-

 default_attributes(
   :exim => {
 default_attributes(
   :exim => {

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

     :routes => {
     :routes => {

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

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

-      :crm_mail => {
-        :comment => "mail@crm.osmfoundation.org",
-        :domains => [ "crm.osmfoundation.org" ],
-        :local_parts => [ "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"
       }
         :maildir => "/var/mail/crm-mail",
         :user => "www-data",
         :group => "mail"
       }

+    },
+    :trusted_users => ["www-data"]
+  },
+  :mysql => {
+    :settings => {
+      :mysqld => {
+        :innodb_strict_mode => true,
+        :innodb_file_per_table => true,
+        :innodb_file_format => "Barracuda"
+      }

     }
   }
 )
     }
   }
 )