Make tilecache cookbook enable nginx cache automatically

[chef.git] / roles / tilecache.rb

diff --git a/roles/tilecache.rb b/roles/tilecache.rb
index c9badd05d17823089494ccb95b3f666f287f9e11..a78cac73d107b1ca67666fd469da117ccb45206e 100644 (file)
--- a/roles/tilecache.rb
+++ b/roles/tilecache.rb
@@ -9,20 +9,11 @@ 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 => {
@@ -73,19 +64,14 @@ default_attributes(
         "kernel.sched_min_granularity_ns" => "10000000",
         "kernel.sched_wakeup_granularity_ns" => "15000000"
       }
-    },
-    :no_tcp_slow_start => {
-      :comment => "REMOVE ME: Temporary Reset TCP slow start back to kernel default",
-      :parameters => {
-          "net.ipv4.tcp_slow_start_after_idle" => "1",
-          "net.ipv4.tcp_no_metrics_save" => "0"
-      }
-    },
-    :tcp_use_bbr => {
-      :comment => "Use TCP BBR Congestion Control",
-      :parameters => {
-        "net.core.default_qdisc" => "fq",
-        "net.ipv4.tcp_congestion_control" => "bbr"
+    }
+  },
+  :tools => {
+    :cron => {
+      :load => {
+        :nice => 19,
+        :io_scheduling_class => "best-effort",
+        :io_scheduling_priority => 7
       }
     }
   }