Replace content_from_file extension with simpler edit_file technique

[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 aac9a45bcd0f34f9dcff02ea3561d6dd3316dd52..831fd60d5351f0135a9f0a704077697003e20c4d 100644 (file)
--- a/cookbooks/tilecache/templates/default/squid.conf.erb
+++ b/cookbooks/tilecache/templates/default/squid.conf.erb
@@ -1,29 +1,51 @@
 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 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
 
 http_access allow osmtile_sites
 
 acl osmtile_nocache_url urlpath_regex \.png/(status|dirty)$
 cache deny osmtile_sites osmtile_nocache_url
 

-cache_peer <%= node[:tilecache][:tile_parent] %> parent 80 0 no-query originserver name=osmtileAccel login=PASS connect-timeout=90 no-digest
-cache_peer yevaud.openstreetmap.org parent 80 0 no-query originserver name=osmtileFileAccel login=PASS connect-timeout=90 no-delay no-digest max-conn=30
+<% 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=osmtileAccelBackup login=PASS connect-timeout=60 no-digest weight=10

 
 

-cache_peer_access osmtileAccel allow osmtile_sites osmtiles_png
+cache_peer_access osmtileAccel allow osmtile_sites
+cache_peer_access osmtileAccelBackup allow osmtile_sites

 cache_peer_access osmtileAccel deny all
 cache_peer_access osmtileAccel deny all

-
-cache_peer_access osmtileFileAccel allow osmtile_sites !osmtiles_png
-cache_peer_access osmtileFileAccel deny all
+cache_peer_access osmtileAccelBackup deny all

 
 #----------------------------------
 #Create an unlimited pool for cache IP addresses
 acl pool_unlimited src 127.0.0.1
 <% @caches.each do |cache| -%>
 
 #----------------------------------
 #Create an unlimited pool for cache IP addresses
 acl pool_unlimited src 127.0.0.1
 <% @caches.each do |cache| -%>

-<% cache.ipaddresses(:family => :inet, :role => :external) do |address| -%>
-  acl pool_unlimited src <%= address %>
+<% cache.ipaddresses(:family => :inet, :role => :external).sort.each do |address| -%>
+acl pool_unlimited src <%= address %>
+acl tile_caches src <%= address %>

 <% end -%>
 <% end -%>
 
 <% end -%>
 <% end -%>
 

+#Allow tile_caches ICP access
+icp_access allow tile_caches
+

 acl pool_000 src 0.0.0.0/7
 acl pool_002 src 2.0.0.0/7
 acl pool_004 src 4.0.0.0/7
 acl pool_000 src 0.0.0.0/7
 acl pool_002 src 2.0.0.0/7
 acl pool_004 src 4.0.0.0/7