X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/9465adbe4321012051bf7c31405620949a11119c..a2cc61fc04a3f25bd5bb5d64ffa5fceca252c4a3:/roles/boitata.rb?ds=sidebyside

diff --git a/roles/boitata.rb b/roles/boitata.rb
index 8bf964a60..048ff75c1 100644
--- a/roles/boitata.rb
+++ b/roles/boitata.rb
@@ -2,13 +2,10 @@ name "boitata"
 description "Master role applied to boitata"
 
 default_attributes(
+  :hardware => {
+    :shm_size => "14g"
+  },
   :networking => {
-    :firewall => {
-      :log => false,
-      :mark => false,
-      :raw => false,
-      :mangle => false
-    },
     :interfaces => {
       :external_ipv4 => {
         :interface => "ens3",
@@ -29,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 => "8192 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 => "curitiba.render.openstreetmap.org",
-    :tile_siblings => [
-      "cherufe.openstreetmap.org",
-      "ascalon.openstreetmap.org",
-      "stormfly-02.openstreetmap.org",
-      "jakelong.openstreetmap.org"
-    ]
+    :tile_parent => "curitiba.render.openstreetmap.org"
   }
 )