X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/2eb5fe3d4f9e1296bbd290669b7d1b99b1e7a8bb..e3986ef9ac0e02ffbcdcd1bd5c63cf4531fe111b:/roles/cherufe.rb

diff --git a/roles/cherufe.rb b/roles/cherufe.rb
index ebf272e46..9d905a037 100644
--- a/roles/cherufe.rb
+++ b/roles/cherufe.rb
@@ -2,6 +2,9 @@ name "cherufe"
 description "Master role applied to cherufe"
 
 default_attributes(
+  :hardware => {
+    :shm_size => "12g"
+  },
   :networking => {
     :interfaces => {
       :external_ipv4 => {
@@ -14,22 +17,32 @@ default_attributes(
       }
     }
   },
+  :openssh => {
+    :port => 45222
+  },
   :squid => {
-    :cache_mem => "6000 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"
+    ]
+  },
+  :nginx => {
+    :cache => {
+      :proxy => {
+        :max_size => "8192M"
+      }
+    }
   },
   :tilecache => {
-    :tile_parent => "vinadelmar.render.openstreetmap.org",
-    :tile_siblings => [
-      "ascalon.openstreetmap.org",
-      "stormfly-02.openstreetmap.org",
-      "jakelong.openstreetmap.org"
-    ]
+    :tile_parent => "vinadelmar.render.openstreetmap.org"
   }
 )
 
 run_list(
   "role[altavoz]",
-  "role[geodns]",
   "role[tilecache]"
 )