Tilecaches: Double default conntrack limit, better handle peaks

[chef.git] / roles / crm.rb

diff --git a/roles/crm.rb b/roles/crm.rb
index 35776f050c50c9294fe20cdd05c60402472d6a32..032bc40a3765c9d8697ec6553b20885826b5d468 100644 (file)
--- a/roles/crm.rb
+++ b/roles/crm.rb
@@ -6,11 +6,20 @@ default_attributes(
   :exim => {
     :local_domains => [ "crm.osmfoundation.org" ],
     :routes => {
-      :crm => {
-        :comment => "crm.osmfoundation.org",
+      :crm_return => {
+        :comment => "return@crm.osmfoundation.org",
         :domains => [ "crm.osmfoundation.org" ],
-        :maildir => "/var/mail/crm",
-        :user => "wordpress",
+        :local_parts => [ "return" ],
+        :maildir => "/var/mail/crm-return",
+        :user => "www-data",
+        :group => "mail"
+      },
+      :crm_mail => {
+        :comment => "mail@crm.osmfoundation.org",
+        :domains => [ "crm.osmfoundation.org" ],
+        :local_parts => [ "mail" ],
+        :maildir => "/var/mail/crm-mail",
+        :user => "www-data",
         :group => "mail"
       }
     }