Configure shared TCP fastopen keys for tile and www

[chef.git] / roles / tilecache.rb

diff --git a/roles/tilecache.rb b/roles/tilecache.rb
index 4f521d077094c860fde8d30ac01f0eff1177d87d..a2e595f3bf93b20a9821fcb0487f3bbc2fc2904f 100644 (file)
--- a/roles/tilecache.rb
+++ b/roles/tilecache.rb
@@ -2,9 +2,22 @@ name "tilecache"
 description "Role applied to all tile cache servers"
 
 default_attributes(
+  :accounts => {
+    :groups => {
+      :proxy => {
+        :members => [:tomh, :grant, :matt, :jburgess]
+      }
+    }
+  },
   :apt => {
     :sources => ["nginx"]
   },
+  :networking => {
+    :tcp_fastopen_key => "tile"
+  },
+  :nginx => {
+    :access_log => false
+  },
   :sysctl => {
     :network_conntrack_time_wait => {
       :comment => "Only track completed connections for 30 seconds",
@@ -15,7 +28,19 @@ default_attributes(
     :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 => {
@@ -28,6 +53,5 @@ default_attributes(
 )
 
 run_list(
-  "role[geodns]",
   "recipe[tilecache]"
 )