Add tests for db cookbook

[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 2cf9db3937ccb8541420b3dc48f2f483086b5c3c..942b4debb7d539e6988fea6e94e860f2c8d168c3 100644 (file)
--- a/cookbooks/tilecache/templates/default/squid.conf.erb
+++ b/cookbooks/tilecache/templates/default/squid.conf.erb
@@ -67,6 +67,8 @@ acl osmtileOverusers referer_regex ^https?://fastpokemap\.com/
 acl osmtileOverusers referer_regex ^https?://[^.]*\.fastpokemap\.com/
 acl osmtileOverusers referer_regex ^https?://pkget\.com/
 acl osmtileOverusers referer_regex ^https?://[^.]*\.pkget\.com/
 acl osmtileOverusers referer_regex ^https?://[^.]*\.fastpokemap\.com/
 acl osmtileOverusers referer_regex ^https?://pkget\.com/
 acl osmtileOverusers referer_regex ^https?://[^.]*\.pkget\.com/

+acl osmtileOverusers referer_regex ^https?://twpkinfo\.com/
+acl osmtileOverusers referer_regex ^https?://[^.]*\.twpkinfo\.com/

 
 # Faked OSM referers
 acl osmtileOverusers referer_regex ^http://www\.openstreetmap\.org/?$
 
 # Faked OSM referers
 acl osmtileOverusers referer_regex ^http://www\.openstreetmap\.org/?$


@@ -119,7 +121,7 @@ acl tile_caches src <%= address %>
 
 # Siblings
 <% node[:tilecache][:tile_siblings].each do |sibling| -%>
 
 # Siblings
 <% node[:tilecache][:tile_siblings].each do |sibling| -%>

-cache_peer <%= sibling %> sibling 3128 3130 weight=1500
+cache_peer <%= sibling %> sibling 3128 4827 htcp weight=1500

 <% end -%>
 
 # Primary Parent
 <% end -%>
 
 # Primary Parent


@@ -151,12 +153,14 @@ acl pool_unlimited src <%= address %>
 
 # Juno Minsk office - me@komzpa.net
 acl pool_unlimited src 212.98.173.54
 
 # Juno Minsk office - me@komzpa.net
 acl pool_unlimited src 212.98.173.54

+<% if node[:squid][:version] < 4 -%>

 
 #Allow tile_caches HTCP access
 htcp_access allow tile_caches
 
 #Allow tile_caches ICP access
 icp_access allow tile_caches
 
 #Allow tile_caches HTCP access
 htcp_access allow tile_caches
 
 #Allow tile_caches ICP access
 icp_access allow tile_caches

+<% end %>

 
 <% (0..127).each do |i| -%>
 acl pool_<%= sprintf("%03d", 2*i) %> src <%= 2*i %>.0.0.0/7
 
 <% (0..127).each do |i| -%>
 acl pool_<%= sprintf("%03d", 2*i) %> src <%= 2*i %>.0.0.0/7