Switch cmok, drogon, gorynych and sarkany to squid 4

[chef.git] / roles / drogon.rb

diff --git a/roles/drogon.rb b/roles/drogon.rb
index e26c7b5b4b3c4739def16d05764ccf6a5faa0819..3160a2f5cf41a6bc37d7e1d1313d4cf466fc0217 100644 (file)
--- a/roles/drogon.rb
+++ b/roles/drogon.rb
@@ -7,6 +7,9 @@ default_attributes(
       :zelja => { :status => :administrator }
     }
   },
+  :hardware => {
+    :shm_size => "18g"
+  },
   :location => "Osijek, Croatia",
   :networking => {
     :interfaces => {
@@ -33,8 +36,14 @@ default_attributes(
     ]
   },
   :squid => {
-    :cache_mem => "20000 MB",
-    :cache_dir => "coss /store/squid/coss-01 128000 block-size=8192 max-size=262144 membufs=80"
+    :version => 4,
+    :cache_mem => "16384 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 => "osijek.render.openstreetmap.org",