From 75de7f924c8f67b5feae7d2666e81da94a695928 Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Fri, 15 Jun 2018 09:09:55 +0100
Subject: [PATCH 1/1] Update squid 3 configurations

---
 roles/ascalon.rb   | 2 +-
 roles/culebre.rb   | 2 +-
 roles/jakelong.rb  | 2 +-
 roles/odin.rb      | 2 +-
 roles/ridgeback.rb | 2 +-
 roles/trogdor.rb   | 4 ++--
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/roles/ascalon.rb b/roles/ascalon.rb
index c9749139b..8bb55527c 100644
--- 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 56f6afc4e..99039aeb2 100644
--- 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 47b1745d1..91dd691b7 100644
--- 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 89d89d0d9..ef9b02cd4 100644
--- 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 187d6bb5a..5074bafdd 100644
--- 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 647a4455c..f4fd327d1 100644
--- 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",
-- 
2.43.2