From: Tom Hughes <tom@compton.nu>
Date: Thu, 10 Oct 2019 17:14:41 +0000 (+0100)
Subject: Switch toothless to squid 4
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/5159ca33a4f0004999c7ee3a38763566861a3f7e?ds=sidebyside

Switch toothless to squid 4
---

diff --git a/roles/toothless.rb b/roles/toothless.rb
index 6c7b2160b..72e4ba877 100644
--- a/roles/toothless.rb
+++ b/roles/toothless.rb
@@ -2,6 +2,9 @@ name "toothless"
 description "Master role applied to toothless"
 
 default_attributes(
+  :hardware => {
+    :shm_size => "6g"
+  },
   :networking => {
     :interfaces => {
       :external_ipv4 => {
@@ -23,8 +26,14 @@ default_attributes(
     }
   },
   :squid => {
-    :cache_mem => "3100 MB",
-    :cache_dir => "coss /store/squid/coss-01 80000 block-size=8192 max-size=262144 membufs=80"
+    :version => 4,
+    :cache_mem => "4096 MB",
+    :cache_dir => [
+      "rock /store/squid/rock-4096 12800 swap-timeout=200 slot-size=4096 max-size=3996",
+      "rock /store/squid/rock-8192 16000 swap-timeout=200 slot-size=8192 min-size=3997 max-size=8092",
+      "rock /store/squid/rock-16384 22400 swap-timeout=200 slot-size=16384 min-size=8093 max-size=16284",
+      "rock /store/squid/rock-32768 22800 swap-timeout=200 slot-size=32768 min-size=16285 max-size=262144"
+    ]
   },
   :tilecache => {
     :tile_parent => "london.render.openstreetmap.org",