Allow multiple squid cache dirs to be specified

[chef.git] / roles / tilecache.rb

diff --git a/roles/tilecache.rb b/roles/tilecache.rb
index 8e1262e81a20c2da7ba4e4f519960a288fdc513a..f45286e374a7fef5792d829032b22db9a10e5a2f 100644 (file)
--- a/roles/tilecache.rb
+++ b/roles/tilecache.rb
@@ -2,32 +2,63 @@ name "tilecache"
 description "Role applied to all tile cache servers"
 
 default_attributes(
+  :accounts => {
+    :groups => {
+      :proxy => {
+        :members => [:tomh, :grant, :matt, :jburgess]
+      }
+    }
+  },
   :apt => {
-    :sources => [ "nginx" ]
+    :sources => ["nginx"]
+  },
+  :networking => {
+    :tcp_fastopen_key => "tile"
+  },
+  :nginx => {
+    :access_log => false
   },
   :sysctl => {
     :network_conntrack_time_wait => {
       :comment => "Only track completed connections for 30 seconds",
-      :parameters => { 
+      :parameters => {
         "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"
+        "net.netfilter.nf_conntrack_max" => "524288"
+      }
+    },
+    :network_local_port_range => {
+      :comment => "Increase available local port range",
+      :parameters => {
+        "net.ipv4.ip_local_port_range" => "4096 64000"
+      }
+    },
+    :kernel_tfo_listen_enable => {
+      :comment => "Enable TCP Fast Open for listening sockets",
+      :parameters => {
+        "net.ipv4.tcp_fastopen" => 3
       }
     },
     :squid_swappiness => {
       :comment => "Prefer not to swapout to free memory",
-      :parameters => { 
+      :parameters => {
         "vm.swappiness" => "30"
       }
+    },
+    :sched_wakeup => {
+      :comment => "Tune scheduler",
+      :parameters => {
+        "kernel.sched_min_granularity_ns" => "10000000",
+        "kernel.sched_wakeup_granularity_ns" => "15000000"
+      }
     }
   }
 )
 
 run_list(
-  "role[geodns]",
   "recipe[tilecache]"
 )