X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/7f7cf763ef59ba604e6f3d1085a5ebbfd39fee69..76157b584c57d86aa2fb79ee2101dde544f2c7a5:/roles/viserion.rb

diff --git a/roles/viserion.rb b/roles/viserion.rb
index 2bd3ec5e4..33675f1aa 100644
--- a/roles/viserion.rb
+++ b/roles/viserion.rb
@@ -7,6 +7,9 @@ default_attributes(
       :anovak => { :status => :administrator }
     }
   },
+  :hardware => {
+    :shm_size => "36g"
+  },
   :location => "Pula, Croatia",
   :munin => {
     :allow => ["193.198.233.210"]
@@ -38,14 +41,17 @@ default_attributes(
     ]
   },
   :squid => {
-    :cache_mem => "32000 MB",
-    :cache_dir => "coss /store/squid/coss-01 128000 block-size=8192 max-size=262144 membufs=80"
+    :version => 4,
+    :cache_mem => "32768 MB",
+    :cache_dir => [
+      "rock /store/squid/rock-4096 20000 swap-timeout=200 slot-size=4096 max-size=3996",
+      "rock /store/squid/rock-8192 25000 swap-timeout=200 slot-size=8192 min-size=3997 max-size=8092",
+      "rock /store/squid/rock-16384 35000 swap-timeout=200 slot-size=16384 min-size=8093 max-size=16284",
+      "rock /store/squid/rock-32768 45000 swap-timeout=200 slot-size=32768 min-size=16285 max-size=262144"
+    ]
   },
   :tilecache => {
-    :tile_parent => "pula.render.openstreetmap.org",
-    :tile_siblings => [
-      "drogon.openstreetmap.org"
-    ]
+    :tile_parent => "pula.render.openstreetmap.org"
   }
 )