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

[chef.git] / roles / kalessin.rb

diff --git a/roles/kalessin.rb b/roles/kalessin.rb
index b1e728219bfcc00cffc8de7aa11c5e4abe81bafd..1a094e65e4e8b8b4a186b401680323d420bf769e 100644 (file)
--- a/roles/kalessin.rb
+++ b/roles/kalessin.rb
@@ -3,7 +3,7 @@ description "Master role applied to kalessin"
 
 default_attributes(
   :hardware => {
-    :shm_size => "18g"
+    :shm_size => "20g"
   },
   :networking => {
     :interfaces => {
@@ -38,22 +38,17 @@ default_attributes(
   :nginx => {
     :cache => {
       :proxy => {
+        :keys_zone => "proxy_cache_zone:64M",
         :max_size => "2048M"
       }
     }
   },
   :tilecache => {
-    :tile_parent => "germany.render.openstreetmap.org",
-    :tile_siblings => [
-      "katie.openstreetmap.org",
-      "konqi.openstreetmap.org",
-      "keizer.openstreetmap.org"
-    ]
+    :tile_parent => "germany.render.openstreetmap.org"
   }
 )
 
 run_list(
   "role[ffrl]",
-  "role[geodns]",
   "role[tilecache]"
 )