Tweak tile cache configuration for squid 4

diff --git a/cookbooks/tilecache/templates/default/squid.conf.erb b/cookbooks/tilecache/templates/default/squid.conf.erb
index b9a396851883f7c5fcd7c741b2c8b0f699059e51..d1478759ff81a68099dde4f29299e52fa0ca9f80 100644 (file)
--- a/cookbooks/tilecache/templates/default/squid.conf.erb
+++ b/cookbooks/tilecache/templates/default/squid.conf.erb
@@ -1,5 +1,5 @@
-acl osmtile_thishost dstdomain <%= node[:fqdn] %>
-acl osmtile_sites dstdomain <%= node[:fqdn] %> a.tile.openstreetmap.org b.tile.openstreetmap.org c.tile.openstreetmap.org tile.openstreetmap.org a.tile.osm.org b.tile.osm.org c.tile.osm.org tile.osm.org
+acl osmtile_thishost dstdomain <%= node.name %>
+acl osmtile_sites dstdomain <%= node.name %> a.tile.openstreetmap.org b.tile.openstreetmap.org c.tile.openstreetmap.org tile.openstreetmap.org a.tile.osm.org b.tile.osm.org c.tile.osm.org tile.osm.org
 acl osmtiles_png urlpath_regex .png$
 
 acl osmtileScrapers browser ^$
@@ -128,7 +128,7 @@ cache_peer <%= sibling %> sibling 3128 3130 weight=1500
 <% if node[:squid][:version] < 4 -%>
 cache_peer <%= node[:tilecache][:tile_parent] %> parent 443 0 no-query originserver name=osmtileAccel login=PASS connect-timeout=120 no-digest weight=1000 ssl ssldomain=render.openstreetmap.org
 <% else -%>
-cache_peer <%= node[:tilecache][:tile_parent] %> parent 443 0 no-query originserver name=osmtileAccel login=PASS connect-timeout=120 no-digest weight=1000 tls ssldomain=render.openstreetmap.org
+cache_peer <%= node[:tilecache][:tile_parent] %> parent 443 0 no-query originserver name=osmtileAccel login=PASS connect-timeout=120 no-digest weight=1000 tls tlsdomain=render.openstreetmap.org
 <% end -%>
 cache_peer_access osmtileAccel allow osmtile_sites
 
@@ -137,7 +137,7 @@ cache_peer_access osmtileAccel allow osmtile_sites
 <% if node[:squid][:version] < 4 -%>
 cache_peer <%= renders[:hostname] %>.render.openstreetmap.org parent 443 0 no-query originserver name=osmtileAccelBackup<%= renders[:hostname] %> login=PASS connect-timeout=60 no-digest weight=10 ssl ssldomain=render.openstreetmap.org
 <% else -%>
-cache_peer <%= renders[:hostname] %>.render.openstreetmap.org parent 443 0 no-query originserver name=osmtileAccelBackup<%= renders[:hostname] %> login=PASS connect-timeout=60 no-digest weight=10 tls ssldomain=render.openstreetmap.org
+cache_peer <%= renders[:hostname] %>.render.openstreetmap.org parent 443 0 no-query originserver name=osmtileAccelBackup<%= renders[:hostname] %> login=PASS connect-timeout=60 no-digest weight=10 tls tlsdomain=render.openstreetmap.org
 <% end -%>
 cache_peer_access osmtileAccelBackup<%= renders[:hostname] %> allow osmtile_sites
 <% end -%>

diff --git a/roles/fume.rb b/roles/fume.rb
index 4b5fbbb8b9b1e6e44489f34971d60d2589f14701..5ee5ce04eeb4b9d82bd2add37b8d1231a92b072e 100644 (file)
--- a/roles/fume.rb
+++ b/roles/fume.rb
@@ -19,9 +19,9 @@ default_attributes(
     :cache_mem => "4096 MB",
     :cache_dir => [
       "rock /store/squid/rock-4096 20000 slot-size=4096 max-size=3996",
-      "rock /store/squid/rock-8192 25000 slot-size=8192 max-size=8092",
-      "rock /store/squid/rock-16384 35000 slot-size=16384 max-size=16284",
-      "rock /store/squid/rock-32768 45000 slot-size=32768 max-size=262144"
+      "rock /store/squid/rock-8192 25000 slot-size=8192 min-size=3997 max-size=8092",
+      "rock /store/squid/rock-16384 35000 slot-size=16384 min-size=8093 max-size=16284",
+      "rock /store/squid/rock-32768 45000 slot-size=32768 min-size=16285 max-size=262144"
     ]
   },
   :tilecache => {