Merge remote-tracking branch 'github/pull/388'

[chef.git] / roles / gorynych.rb

diff --git a/roles/gorynych.rb b/roles/gorynych.rb
index 1799f18dca25d5c09d316efc275f6dafd5cd5a96..c57c56e0f871920edac5826f63b7cbec3ed17c38 100644 (file)
--- a/roles/gorynych.rb
+++ b/roles/gorynych.rb
@@ -3,7 +3,10 @@ description "Master role applied to gorynych"
 
 default_attributes(
   :hardware => {
 
 default_attributes(
   :hardware => {

-    :shm_size => "18g"
+    :ipmi => {
+      :excluded_sensors => [3, 4]
+    },
+    :shm_size => "20g"

   },
   :munin => {
     :plugins => {
   },
   :munin => {
     :plugins => {


@@ -54,6 +57,14 @@ default_attributes(
       "rock /store/squid/rock-32768 45000 swap-timeout=200 slot-size=32768 min-size=16285 max-size=262144"
     ]
   },
       "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"
   }
   :tilecache => {
     :tile_parent => "moscow.render.openstreetmap.org"
   }