Update squid 3 configurations

diff --git a/roles/ascalon.rb b/roles/ascalon.rb
index c9749139b78e05fda552c8287e2435dafc36b07b..8bb55527cb48784503fba12dd948ea203f9b59ad 100644 (file)
--- a/roles/ascalon.rb
+++ b/roles/ascalon.rb
@@ -17,7 +17,7 @@ default_attributes(
   :squid => {
     :version => "3",
     :cache_mem => "16000 MB",
-    :cache_dir => "rock /store/squid/rock-01 128000 swap-timeout=500 max-swap-rate=100 slot-size=4096 max-size=262144"
+    :cache_dir => "rock /store/squid/rock-01 128000 swap-timeout=300 max-swap-rate=50 slot-size=4096 max-size=262144"
   },
   :tilecache => {
     :tile_parent => "montreal.render.openstreetmap.org",

diff --git a/roles/culebre.rb b/roles/culebre.rb
index 56f6afc4ec0232080ff8223f9f1158611f914b73..99039aeb2aab220390688d8e0858001eb3e0adb1 100644 (file)
--- a/roles/culebre.rb
+++ b/roles/culebre.rb
@@ -24,7 +24,7 @@ default_attributes(
   :squid => {
     :version => "3",
     :cache_mem => "6100 MB",
-    :cache_dir => "rock /store/squid/rock-01 80000 swap-timeout=500 max-swap-rate=150 slot-size=4096 max-size=262144"
+    :cache_dir => "rock /store/squid/rock-01 80000 swap-timeout=300 max-swap-rate=50 slot-size=4096 max-size=262144"
   },
   :tilecache => {
     :tile_parent => "zaragoza.render.openstreetmap.org",

diff --git a/roles/jakelong.rb b/roles/jakelong.rb
index 47b1745d15ad3e33545d12210debc8e304ae7619..91dd691b77a5f4379e641974d7d2d22a89a55ac8 100644 (file)
--- a/roles/jakelong.rb
+++ b/roles/jakelong.rb
@@ -25,7 +25,7 @@ default_attributes(
   :squid => {
     :version => 3,
     :cache_mem => "350 MB",
-    :cache_dir => "rock /store/squid/rock-01 7500 swap-timeout=500 max-swap-rate=100 slot-size=4096 max-size=262144"
+    :cache_dir => "rock /store/squid/rock-01 7500 swap-timeout=300 max-swap-rate=50 slot-size=4096 max-size=262144"
   },
   :sysctl => {
     :kvm => {

diff --git a/roles/odin.rb b/roles/odin.rb
index 89d89d0d946bb9e2b4d3a3b34b4ddb96d2aabe4a..ef9b02cd41f1de5c47dc49ae20ab62a7a2ae180b 100644 (file)
--- a/roles/odin.rb
+++ b/roles/odin.rb
@@ -32,7 +32,7 @@ default_attributes(
   :squid => {
     :version => "3",
     :cache_mem => "14000 MB",
-    :cache_dir => "rock /store/squid/rock-01 128000 swap-timeout=500 max-swap-rate=150 slot-size=4096 max-size=262144"
+    :cache_dir => "rock /store/squid/rock-01 128000 swap-timeout=300 max-swap-rate=50 slot-size=4096 max-size=262144"
   },
   :tilecache => {
     :tile_parent => "aalborg.render.openstreetmap.org",

diff --git a/roles/ridgeback.rb b/roles/ridgeback.rb
index 187d6bb5a9edc9b326e77da4d690824e4e1e8779..5074bafdd4172834f3eac395f65360dd8007a4bc 100644 (file)
--- a/roles/ridgeback.rb
+++ b/roles/ridgeback.rb
@@ -48,7 +48,7 @@ default_attributes(
   :squid => {
     :version => "3",
     :cache_mem => "5500 MB",
-    :cache_dir => "rock /store/squid/rock-01 128000 swap-timeout=500 max-swap-rate=100 slot-size=4096 max-size=262144"
+    :cache_dir => "rock /store/squid/rock-01 128000 swap-timeout=300 max-swap-rate=50 slot-size=4096 max-size=262144"
   },
   :tilecache => {
     :tile_parent => "oslo.render.openstreetmap.org",

diff --git a/roles/trogdor.rb b/roles/trogdor.rb
index 647a4455cce9edd1cec366db603f7e13c5405e51..f4fd327d1d1a3a406d34ffbeffc0ddfa21db4b31 100644 (file)
--- a/roles/trogdor.rb
+++ b/roles/trogdor.rb
@@ -26,9 +26,9 @@ default_attributes(
     }
   },
   :squid => {
-    :version => 3,
+    :version => "3",
     :cache_mem => "6400 MB",
-    :cache_dir => "rock /store/squid/rock-01 128000 swap-timeout=500 max-swap-rate=150 slot-size=4096 max-size=262144"
+    :cache_dir => "rock /store/squid/rock-01 128000 swap-timeout=300 max-swap-rate=50 slot-size=4096 max-size=262144"
   },
   :tilecache => {
     :tile_parent => "amsterdam.render.openstreetmap.org",