Suppress mounting of /store/rails when GPX data is offline

[chef.git] / roles / gorynych.rb

diff --git a/roles/gorynych.rb b/roles/gorynych.rb
index afdb63b449e5d5e1979e0adc66e91f16e88163b4..5a172a5461abc6bc4d8fa1e70406acb980228fc0 100644 (file)
--- a/roles/gorynych.rb
+++ b/roles/gorynych.rb
@@ -3,7 +3,7 @@ description "Master role applied to gorynych"
 
 default_attributes(
   :hardware => {
-    :shm_size => "18g"
+    :shm_size => "20g"
   },
   :munin => {
     :plugins => {
@@ -48,18 +48,22 @@ default_attributes(
     :version => 4,
     :cache_mem => "16384 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"
+      "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 => {
+        :directory => "/store/nginx-cache/proxy-cache",
+        :max_size => "32768M"
+      }
+    }
+  },
   :tilecache => {
-    :tile_parent => "moscow.render.openstreetmap.org",
-    :tile_siblings => [
-      "noomoahk.openstreetmap.org",
-      "cmok.openstreetmap.org"
-    ]
+    :tile_parent => "moscow.render.openstreetmap.org"
   }
 )