Don't apply HP disk rules to disks not on HP controllers

[chef.git] / roles / wiki.rb

diff --git a/roles/wiki.rb b/roles/wiki.rb
index 057131b914846f3fa7a9d4c771cd0f06551563d2..b7243e2934d6625d74d67362f580f62c2c68e6fd 100644 (file)
--- a/roles/wiki.rb
+++ b/roles/wiki.rb
@@ -24,6 +24,7 @@ default_attributes(
     }
   },
   :exim => {
+    :smarthost_via => "fafnir.openstreetmap.org:26",
     :trusted_users => %w[www-data wiki],
     :aliases => {
       :root => "grant"
@@ -37,11 +38,19 @@ default_attributes(
     ]
   },
   :memcached => {
-    :memory_limit => 1024,
+    :memory_limit => 4096,
     :connection_limit => 8192,
     :chunk_growth_factor => 1.25,
     :min_item_size => 48
   },
+  :sysctl => {
+    :swappiness => {
+      :comment => "Reduce swap usage",
+      :parameters => {
+        "vm.swappiness" => 10
+      }
+    }
+  },
   :mysql => {
     :settings => {
       :mysqld => {