Merge pull request #236 from Tigerfell/master

[chef.git] / roles / tilecache.rb

diff --git a/roles/tilecache.rb b/roles/tilecache.rb
index 86a4942856cd527abc17e2a497378f64408fd13e..e2cad2518cfa613ce49684c12019a818b42c2793 100644 (file)
--- a/roles/tilecache.rb
+++ b/roles/tilecache.rb
@@ -12,12 +12,8 @@ default_attributes(
   :apt => {
     :sources => ["nginx"]
   },
   :apt => {
     :sources => ["nginx"]
   },

-  :munin => {
-    :plugins => {
-      :cpu => {
-        :user => { :warning => 100, :critical => 200 }
-      }
-    }
+  :nginx => {
+    :access_log => false

   },
   :sysctl => {
     :network_conntrack_time_wait => {
   },
   :sysctl => {
     :network_conntrack_time_wait => {


@@ -29,7 +25,19 @@ default_attributes(
     :network_conntrack_max => {
       :comment => "Increase max number of connections tracked",
       :parameters => {
     :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 => {
       }
     },
     :squid_swappiness => {