Update carto stylesheet to v4.24.1

[chef.git] / roles / necrosan.rb

diff --git a/roles/necrosan.rb b/roles/necrosan.rb
index f042dd78e9c8e42d52150cac79f6fc96ecac97bd..66fdf569bc76969b3599b209c6c7bc4b185a182c 100644 (file)
--- a/roles/necrosan.rb
+++ b/roles/necrosan.rb
@@ -2,6 +2,9 @@ name "necrosan"
 description "Master role applied to necrosan"
 
 default_attributes(
 description "Master role applied to necrosan"
 
 default_attributes(

+  :hardware => {
+    :shm_size => "14g"
+  },

   :networking => {
     :interfaces => {
       :external_ipv4 => {
   :networking => {
     :interfaces => {
       :external_ipv4 => {


@@ -23,17 +26,24 @@ default_attributes(
     }
   },
   :squid => {
     }
   },
   :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 => "12288 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 => "france.render.openstreetmap.org",
     :tile_siblings => [
   },
   :tilecache => {
     :tile_parent => "france.render.openstreetmap.org",
     :tile_siblings => [

-      "noomoahk.openstreetmap.org",
+      # "necrosan.openstreetmap.org",

       "nepomuk.openstreetmap.org",
       "nepomuk.openstreetmap.org",

+      "noomoahk.openstreetmap.org",

       "norbert.openstreetmap.org",
       "ladon.openstreetmap.org",
       "norbert.openstreetmap.org",
       "ladon.openstreetmap.org",

-      "culebre.openstreetmap.org"
+      "gorynych.openstreetmap.org"

     ]
   }
 )
     ]
   }
 )