geodns: enable include_optional_ns to please picky DNS servers

[chef.git] / roles / sarkany.rb

diff --git a/roles/sarkany.rb b/roles/sarkany.rb
index 30b7afab76d42517af834a775b0e254f286a4ca2..6cd1424f73c25cc4f22a71bc32882ec91aee397b 100644 (file)
--- a/roles/sarkany.rb
+++ b/roles/sarkany.rb
@@ -2,6 +2,9 @@ name "sarkany"
 description "Master role applied to sarkany"
 
 default_attributes(
 description "Master role applied to sarkany"
 
 default_attributes(

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

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


@@ -23,19 +26,24 @@ default_attributes(
     }
   },
   :squid => {
     }
   },
   :squid => {

-    :cache_mem => "6100 MB",
-    :cache_dir => "coss /store/squid/coss-01 80000 block-size=8192 max-size=262144 membufs=80"
+    :version => 4,
+    :cache_mem => "6144 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 => {
+        :max_size => "4096M"
+      }
+    }

   },
   :tilecache => {
   },
   :tilecache => {

-    :tile_parent => "budapest.render.openstreetmap.org",
-    :tile_siblings => [
-      "trogdor.openstreetmap.org",
-      "katie.openstreetmap.org",
-      "konqi.openstreetmap.org",
-      "ridgeback.openstreetmap.org",
-      "fume.openstreetmap.org",
-      "gorynych.openstreetmap.org"
-    ]
+    :tile_parent => "budapest.render.openstreetmap.org"

   }
 )
 
   }
 )