Move cron customisation for tile caches to the tools cookbook

[chef.git] / roles / tilecache.rb

diff --git a/roles/tilecache.rb b/roles/tilecache.rb
index 12457a4ca7cc78dd489b26d3c133420788486c8f..dc6fadf7b70c3dea917d1dd9fd8b2b245d4c99ad 100644 (file)
--- a/roles/tilecache.rb
+++ b/roles/tilecache.rb
@@ -12,10 +12,25 @@ default_attributes(
   :apt => {
     :sources => ["nginx"]
   },
+  :networking => {
+    :tcp_fastopen_key => "tile"
+  },
   :nginx => {
-    :access_log => nil
+    :access_log => false,
+    :cache => {
+      :proxy => {
+        :enable => true,
+        :keys_zone => "proxy_cache_zone:128M"
+      }
+    }
   },
   :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 => {
@@ -25,7 +40,19 @@ default_attributes(
     :network_conntrack_max => {
       :comment => "Increase max number of connections tracked",
       :parameters => {
-        "net.netfilter.nf_conntrack_max" => "262142"
+        "net.netfilter.nf_conntrack_max" => "524288"
+      }
+    },
+    :network_local_port_range => {
+      :comment => "Increase available local port range",
+      :parameters => {
+        "net.ipv4.ip_local_port_range" => "1024\t65535"
+      }
+    },
+    :network_tcp_timewait_reuse => {
+      :comment => "Allow tcp timewait reuse",
+      :parameters => {
+        "net.ipv4.tcp_tw_reuse" => 1
       }
     },
     :kernel_tfo_listen_enable => {
@@ -37,7 +64,23 @@ default_attributes(
     :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
       }
     }
   }