Remvoe cleanup code

[chef.git] / cookbooks / tilecache / templates / default / squid.conf.erb

diff --git a/cookbooks/tilecache/templates/default/squid.conf.erb b/cookbooks/tilecache/templates/default/squid.conf.erb
index a4d7e53ceb575542779a4a881e727b00f0526105..f0a04bcd430d190fce5edc48c53174e1dcc00b85 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 ^$
 acl osmtiles_png urlpath_regex .png$
 
 acl osmtileScrapers browser ^$


@@ -45,7 +45,6 @@ acl osmtileScrapers browser ^node\-fetch\/
 acl osmtileScrapers browser ^R$
 acl osmtileScrapers browser ^Java\/
 acl osmtileScrapers browser ^tiles$
 acl osmtileScrapers browser ^R$
 acl osmtileScrapers browser ^Java\/
 acl osmtileScrapers browser ^tiles$

-acl osmtileScrapers browser ^Dalvik\/

 acl osmtileScrapers browser ^runtastic
 
 acl is_fake_browser browser Firefox\/3\.0
 acl osmtileScrapers browser ^runtastic
 
 acl is_fake_browser browser Firefox\/3\.0


@@ -118,7 +117,7 @@ acl tile_caches src <%= address %>
 <% end -%>
 <% end -%>
 
 <% end -%>
 <% end -%>
 

-<% if node[:squid][:version] == "2" -%>
+<% if node[:squid][:version] == 2 -%>

 # Siblings
 <% node[:tilecache][:tile_siblings].each do |sibling| -%>
 cache_peer <%= sibling %> sibling 3128 3130 weight=1500
 # Siblings
 <% node[:tilecache][:tile_siblings].each do |sibling| -%>
 cache_peer <%= sibling %> sibling 3128 3130 weight=1500


@@ -126,12 +125,20 @@ cache_peer <%= sibling %> sibling 3128 3130 weight=1500
 <% end -%>
 
 # Primary Parent
 <% end -%>
 
 # Primary Parent

+<% 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
 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 tlsdomain=render.openstreetmap.org
+<% end -%>

 cache_peer_access osmtileAccel allow osmtile_sites
 
 # Backup Parents
 <% @renders.each do |renders| -%>
 cache_peer_access osmtileAccel allow osmtile_sites
 
 # Backup Parents
 <% @renders.each do |renders| -%>

+<% 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
 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 tlsdomain=render.openstreetmap.org
+<% end -%>

 cache_peer_access osmtileAccelBackup<%= renders[:hostname] %> allow osmtile_sites
 <% end -%>
 
 cache_peer_access osmtileAccelBackup<%= renders[:hostname] %> allow osmtile_sites
 <% end -%>