X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/a82377363adab8a3a1421becc1b3195e56dc83bb..8b26972a6378577bb1f565093453bce77752a8eb:/roles/nidhogg.rb?ds=sidebyside

diff --git a/roles/nidhogg.rb b/roles/nidhogg.rb
index e17375765..451950fdb 100644
--- a/roles/nidhogg.rb
+++ b/roles/nidhogg.rb
@@ -2,6 +2,9 @@ name "nidhogg"
 description "Master role applied to nidhogg"
 
 default_attributes(
+  :hardware => {
+    :shm_size => "14g"
+  },
   :networking => {
     :interfaces => {
       :external_ipv4 => {
@@ -23,17 +26,17 @@ default_attributes(
     }
   },
   :squid => {
-    :cache_mem => "7500 MB",
-    :cache_dir => "coss /store/squid/coss-01 128000 block-size=8192 max-size=262144 membufs=80"
+    :version => 4,
+    :cache_mem => "10240 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 => "sweden.render.openstreetmap.org",
-    :tile_siblings => [
-      "fafnir.openstreetmap.org",
-      "ridgeback.openstreetmap.org",
-      "rimfaxe.openstreetmap.org",
-      "trogdor.openstreetmap.org"
-    ]
+    :tile_parent => "sweden.render.openstreetmap.org"
   }
 )