X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/67c2aceb91955ff583c41807759d203a4478e4b1..66f99783a567acd1eb1a0fee09d4cf799e40bc85:/roles/tilecache.rb

diff --git a/roles/tilecache.rb b/roles/tilecache.rb
index 8e6da21ee..a76af78a7 100644
--- a/roles/tilecache.rb
+++ b/roles/tilecache.rb
@@ -9,17 +9,16 @@ default_attributes(
       }
     }
   },
-  :apt => {
-    :sources => ["nginx"]
-  },
-  :munin => {
-    :plugins => {
-      :cpu => {
-        :user => { :warning => 200, :critical => 400 }
-      }
-    }
+  :nginx => {
+    :access_log => false
   },
   :sysctl => {
+    :sockets => {
+      :comment => "Increase size of connection queue",
+      :parameters => {
+        "net.core.somaxconn" => 10000
+      }
+    },
     :network_conntrack_time_wait => {
       :comment => "Only track completed connections for 30 seconds",
       :parameters => {
@@ -29,19 +28,41 @@ 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"
       }
     },
-    :kernel_tfo_listen_enable => {
-      :comment => "Enable TCP Fast Open for listening sockets",
+    :network_local_port_range => {
+      :comment => "Increase available local port range",
       :parameters => {
-        "net.ipv4.tcp_fastopen" => 3
+        "net.ipv4.ip_local_port_range" => "1024\t65535"
+      }
+    },
+    :network_tcp_timewait_reuse => {
+      :comment => "Allow tcp timewait reuse",
+      :parameters => {
+        "net.ipv4.tcp_tw_reuse" => 1
       }
     },
     :squid_swappiness => {
       :comment => "Prefer not to swapout to free memory",
       :parameters => {
-        "vm.swappiness" => "30"
+        "vm.swappiness" => "1"
+      }
+    },
+    :sched_wakeup => {
+      :comment => "Tune scheduler",
+      :parameters => {
+        "kernel.sched_min_granularity_ns" => "10000000",
+        "kernel.sched_wakeup_granularity_ns" => "15000000"
+      }
+    }
+  },
+  :tools => {
+    :cron => {
+      :load => {
+        :nice => 19,
+        :io_scheduling_class => "best-effort",
+        :io_scheduling_priority => 7
       }
     }
   }