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

[chef.git] / roles / tilecache.rb

diff --git a/roles/tilecache.rb b/roles/tilecache.rb
index d7aae8af14c6dd906bef9b4b2334395722343069..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 => {
   :nginx => {

-    :access_log => false,
-    :cache => {
-      :proxy => {
-        :enable => true,
-        :keys_zone => "proxy_cache_zone:64M",
-      }
-    }
+    :access_log => false

   },
   :sysctl => {
     :sockets => {
   },
   :sysctl => {
     :sockets => {


@@ -55,12 +43,6 @@ default_attributes(
         "net.ipv4.tcp_tw_reuse" => 1
       }
     },
         "net.ipv4.tcp_tw_reuse" => 1
       }
     },

-    :kernel_tfo_listen_enable => {
-      :comment => "Enable TCP Fast Open for listening sockets",
-      :parameters => {
-        "net.ipv4.tcp_fastopen" => 3
-      }
-    },

     :squid_swappiness => {
       :comment => "Prefer not to swapout to free memory",
       :parameters => {
     :squid_swappiness => {
       :comment => "Prefer not to swapout to free memory",
       :parameters => {


@@ -73,12 +55,14 @@ default_attributes(
         "kernel.sched_min_granularity_ns" => "10000000",
         "kernel.sched_wakeup_granularity_ns" => "15000000"
       }
         "kernel.sched_min_granularity_ns" => "10000000",
         "kernel.sched_wakeup_granularity_ns" => "15000000"
       }

-    },
-    :no_tcp_slow_start => {
-      :comment => "Ensure TCP slow start is disabled",
-      :parameters => {
-          "net.ipv4.tcp_slow_start_after_idle" => "0",
-          "net.ipv4.tcp_no_metrics_save" => "0"
+    }
+  },
+  :tools => {
+    :cron => {
+      :load => {
+        :nice => 19,
+        :io_scheduling_class => "best-effort",
+        :io_scheduling_priority => 7

       }
     }
   }
       }
     }
   }