X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/f1f08456269c816dc488e5a8d45d4e88b2ca4148..5cffb5b0ddf35b84074a81929f05982d76a13008:/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 0d6ea1099..831fd60d5 100644
--- a/cookbooks/tilecache/templates/default/squid.conf.erb
+++ b/cookbooks/tilecache/templates/default/squid.conf.erb
@@ -1,23 +1,37 @@
 acl osmtile_sites dstdomain 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 ^offlinemap\-lite
+#http_access deny osmtile_sites osmtileScrapers
+
 http_access allow osmtile_sites
 
 acl osmtile_nocache_url urlpath_regex \.png/(status|dirty)$
 cache deny osmtile_sites osmtile_nocache_url
 
-<% if node[:fqdn] == "nadder-01.openstreetmap.org" || node[:fqdn] == "nadder-02.openstreetmap.org" -%> 
-<% @caches.each do |cache| -%>
-<% cache.ipaddresses(:family => :inet, :role => :external).sort.each do |address| -%>
-#cache_peer <%= address %> sibling 3128 3130 background-ping weighted-round-robin
+<% if node[:fqdn] == "nadder-01.openstreetmap.org" -%>
+cache_peer nadder-02.openstreetmap.org sibling 3128 3130 proxy-only
+<% end -%>
+<% if node[:fqdn] == "nadder-02.openstreetmap.org" -%> 
+cache_peer nadder-01.openstreetmap.org sibling 3128 3130 proxy-only
+<% end -%>
+<% if node[:fqdn] == "trogdor.openstreetmap.org" -%>
+cache_peer fume.openstreetmap.org sibling 3128 3130
 <% end -%>
+<% if node[:fqdn] == "fume.openstreetmap.org" -%>
+cache_peer trogdor.openstreetmap.org sibling 3128 3130
 <% end -%>
+<% if node[:fqdn] == "jakelong.openstreetmap.org" -%>
+cache_peer nadder-01.openstreetmap.org sibling 3128 3130 proxy-only
+cache_peer nadder-02.openstreetmap.org sibling 3128 3130 proxy-only
 <% end -%>
 cache_peer <%= node[:tilecache][:tile_parent] %> parent 80 0 no-query originserver name=osmtileAccel login=PASS connect-timeout=60 no-digest weight=1000
-#cache_peer render.openstreetmap.org parent 80 0 no-query originserver name=osmtileAccel login=PASS connect-timeout=60 no-digest weight=10
+cache_peer render.openstreetmap.org parent 80 0 no-query originserver name=osmtileAccelBackup login=PASS connect-timeout=60 no-digest weight=10
 
 cache_peer_access osmtileAccel allow osmtile_sites
+cache_peer_access osmtileAccelBackup allow osmtile_sites
 cache_peer_access osmtileAccel deny all
+cache_peer_access osmtileAccelBackup deny all
 
 #----------------------------------
 #Create an unlimited pool for cache IP addresses