Label SNMP statistics with the site name

[chef.git] / roles / norbert.rb

diff --git a/roles/norbert.rb b/roles/norbert.rb
index 9cc25b69ec48b6d8253d257bcc88c099eb654d38..15433754edc46cbb9314b761ce7d3cdadf703301 100644 (file)
--- a/roles/norbert.rb
+++ b/roles/norbert.rb
@@ -3,7 +3,7 @@ description "Master role applied to norbert"
 
 default_attributes(
   :hardware => {
 
 default_attributes(
   :hardware => {

-    :shm_size => "14g"
+    :shm_size => "12g"

   },
   :networking => {
     :interfaces => {
   },
   :networking => {
     :interfaces => {


@@ -27,7 +27,7 @@ default_attributes(
   },
   :squid => {
     :version => 4,
   },
   :squid => {
     :version => 4,

-    :cache_mem => "12288 MB",
+    :cache_mem => "10240 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",
     :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",


@@ -38,16 +38,13 @@ default_attributes(
   :nginx => {
     :cache => {
       :proxy => {
   :nginx => {
     :cache => {
       :proxy => {

+        :keys_zone => "proxy_cache_zone:64M",

         :max_size => "2048M"
       }
     }
   },
   :tilecache => {
         :max_size => "2048M"
       }
     }
   },
   :tilecache => {

-    :tile_parent => "france.render.openstreetmap.org",
-    :tile_siblings => [
-      "noomoahk.openstreetmap.org",
-      "ladon.openstreetmap.org"
-    ]
+    :tile_parent => "france.render.openstreetmap.org"

   }
 )
 
   }
 )