X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/5d1d6e6fe5331ba77867993703c36c2d902933a9..f59ba065beebca01875211a01a54692ea7c0b32d:/roles/norbert.rb?ds=sidebyside

diff --git a/roles/norbert.rb b/roles/norbert.rb
index 8476393d6..15433754e 100644
--- a/roles/norbert.rb
+++ b/roles/norbert.rb
@@ -2,6 +2,9 @@ name "norbert"
 description "Master role applied to norbert"
 
 default_attributes(
+  :hardware => {
+    :shm_size => "12g"
+  },
   :networking => {
     :interfaces => {
       :external_ipv4 => {
@@ -23,15 +26,25 @@ default_attributes(
     }
   },
   :squid => {
-    :cache_mem => "7500 MB",
-    :cache_dir => "coss /store/squid/coss-01 80000 block-size=8192 max-size=262144 membufs=80"
+    :version => 4,
+    :cache_mem => "10240 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"
+    ]
+  },
+  :nginx => {
+    :cache => {
+      :proxy => {
+        :keys_zone => "proxy_cache_zone:64M",
+        :max_size => "2048M"
+      }
+    }
   },
   :tilecache => {
-    :tile_parent => "france.render.openstreetmap.org",
-    :tile_siblings => [
-      "noomoahk.openstreetmap.org",
-      "ladon.openstreetmap.org"
-    ]
+    :tile_parent => "france.render.openstreetmap.org"
   }
 )