X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/2e0fdc14fdd82cf94ee655d6cdd34f28d2d9754f..207dca167b6211116a0af448aff9907f3e3ab4bd:/roles/cmok.rb?ds=inline

diff --git a/roles/cmok.rb b/roles/cmok.rb
index 659a23997..5653d09c9 100644
--- a/roles/cmok.rb
+++ b/roles/cmok.rb
@@ -2,6 +2,16 @@ name "cmok"
 description "Master role applied to cmok"
 
 default_attributes(
+  :hardware => {
+    :shm_size => "6g"
+  },
+  :munin => {
+    :plugins => {
+      "diskstats_latency.sdd" => {
+        :avgrdwait => { :warning => "0:30" }
+      }
+    }
+  },
   :networking => {
     :interfaces => {
       :external_ipv4 => {
@@ -18,23 +28,22 @@ default_attributes(
         :family => :inet6,
         :address => "2001:67c:2268:1005:21e:8cff:fe8c:8d3b",
         :prefix => "64",
-        :gateway => "fe80::20c:42ff:feb2:8ff9"
+        :gateway => "fe80::20c:42ff:feb2:8ff8"
       }
     }
   },
   :squid => {
+    :version => 4,
     :cache_mem => "4096 MB",
-    :cache_dir => "coss /store/squid/coss-01 80000 block-size=8192 max-size=262144 membufs=80"
+    :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"
+    ]
   },
   :tilecache => {
-    :tile_parent => "minsk.render.openstreetmap.org",
-    :tile_siblings => [
-      "trogdor.openstreetmap.org",
-      "katie.openstreetmap.org",
-      "konqi.openstreetmap.org",
-      "ridgeback.openstreetmap.org",
-      "gorynych.openstreetmap.org"
-    ]
+    :tile_parent => "minsk.render.openstreetmap.org"
   }
 )