Make sure tile cookbook only requests the required postgres version

[chef.git] / roles / fume.rb

diff --git a/roles/fume.rb b/roles/fume.rb
index 4af18a3bf7111ac2481fd32d9532c026c081f04f..176a22d617b8299289a5cf33b1143163802e11b5 100644 (file)
--- a/roles/fume.rb
+++ b/roles/fume.rb
@@ -2,6 +2,9 @@ name "fume"
 description "Master role applied to fume"
 
 default_attributes(
+  :hardware => {
+    :shm_size => "6g"
+  },
   :networking => {
     :interfaces => {
       :external_ipv4 => {
@@ -15,23 +18,17 @@ default_attributes(
     }
   },
   :squid => {
-    :version => 3,
+    :version => 4,
     :cache_mem => "4096 MB",
     :cache_dir => [
-      "rock /store/squid/rock-4096 50000 swap-timeout=300 max-swap-rate=50 slot-size=4096 max-size=3996",
-      "rock /store/squid/rock-8192 15000 swap-timeout=300 max-swap-rate=50 slot-size=8192 max-size=8092",
-      "rock /store/squid/rock-16384 25000 swap-timeout=300 max-swap-rate=50 slot-size=16384 max-size=16284",
-      "rock /store/squid/rock-32768 35000 swap-timeout=300 max-swap-rate=50 slot-size=32768 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"
     ]
   },
   :tilecache => {
-    :tile_parent => "pilsen.render.openstreetmap.org",
-    :tile_siblings => [
-      "sarkany.openstreetmap.org",
-      "chrysophylax.openstreetmap.org",
-      "drogon.openstreetmap.org",
-      "viserion.openstreetmap.org"
-    ]
+    :tile_parent => "pilsen.render.openstreetmap.org"
   }
 )