X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/f3e4b02ec18540c4bb70218d993560ed8c7c4c61..787431aa384f07d403f422ca64447e8bdf794e3f:/roles/simurgh.rb

diff --git a/roles/simurgh.rb b/roles/simurgh.rb
index e0a29ee70..b0be37c78 100644
--- a/roles/simurgh.rb
+++ b/roles/simurgh.rb
@@ -2,6 +2,9 @@ name "simurgh"
 description "Master role applied to simurgh"
 
 default_attributes(
+  :hardware => {
+    :shm_size => "18g"
+  },
   :networking => {
     :interfaces => {
       :external_ipv4 => {
@@ -15,15 +18,27 @@ default_attributes(
     }
   },
   :squid => {
-    :cache_mem => "6400 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 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"
+    ]
+  },
+  :nginx => {
+    :cache => {
+      :proxy => {
+        :max_size => "2048M"
+      }
+    }
   },
   :tilecache => {
     :tile_parent => "baku.render.openstreetmap.org",
     :tile_siblings => [
       "katie.openstreetmap.org",
       "konqi.openstreetmap.org",
-      "nepomuk.openstreetmap.org",
       "ridgeback.openstreetmap.org"
     ]
   }