Merge remote-tracking branch 'github/pull/354'

[chef.git] / roles / tilecache.rb

diff --git a/roles/tilecache.rb b/roles/tilecache.rb
index ac17511a02eb85aa98869574b9fbbf2a0a646610..a76af78a7f627b24e82597bc0d89ef14ed5d36b4 100644 (file)
--- a/roles/tilecache.rb
+++ b/roles/tilecache.rb
@@ -9,20 +9,8 @@ default_attributes(
       }
     }
   },
-  :apt => {
-    :sources => ["nginx"]
-  },
-  :networking => {
-    :tcp_fastopen_key => "tile"
-  },
   :nginx => {
-    :access_log => false,
-    :cache => {
-      :proxy => {
-        :enable => true,
-        :keys_zone => "proxy_cache_zone:64M",
-      }
-    }
+    :access_log => false
   },
   :sysctl => {
     :sockets => {
@@ -46,13 +34,13 @@ default_attributes(
     :network_local_port_range => {
       :comment => "Increase available local port range",
       :parameters => {
-        "net.ipv4.ip_local_port_range" => "1024\t65000"
+        "net.ipv4.ip_local_port_range" => "1024\t65535"
       }
     },
-    :kernel_tfo_listen_enable => {
-      :comment => "Enable TCP Fast Open for listening sockets",
+    :network_tcp_timewait_reuse => {
+      :comment => "Allow tcp timewait reuse",
       :parameters => {
-        "net.ipv4.tcp_fastopen" => 3
+        "net.ipv4.tcp_tw_reuse" => 1
       }
     },
     :squid_swappiness => {
@@ -68,6 +56,15 @@ default_attributes(
         "kernel.sched_wakeup_granularity_ns" => "15000000"
       }
     }
+  },
+  :tools => {
+    :cron => {
+      :load => {
+        :nice => 19,
+        :io_scheduling_class => "best-effort",
+        :io_scheduling_priority => 7
+      }
+    }
   }
 )