Tilecaches: Double default conntrack limit, better handle peaks

[chef.git] / roles / tilecache.rb

diff --git a/roles/tilecache.rb b/roles/tilecache.rb
index daaaddf2c3d2ca87e5e51b461973a5b8cb908136..8e1262e81a20c2da7ba4e4f519960a288fdc513a 100644 (file)
--- a/roles/tilecache.rb
+++ b/roles/tilecache.rb
@@ -2,6 +2,9 @@ name "tilecache"
 description "Role applied to all tile cache servers"
 
 default_attributes(
+  :apt => {
+    :sources => [ "nginx" ]
+  },
   :sysctl => {
     :network_conntrack_time_wait => {
       :comment => "Only track completed connections for 30 seconds",
@@ -9,6 +12,12 @@ default_attributes(
         "net.netfilter.nf_conntrack_tcp_timeout_time_wait" => "30"
       }
     },
+    :network_conntrack_max => {
+      :comment => "Increase max number of connections tracked",
+      :parameters => {
+         "net.netfilter.nf_conntrack_max" => "131072"
+      }
+    },
     :squid_swappiness => {
       :comment => "Prefer not to swapout to free memory",
       :parameters => {